Merge "App config path change"