Merge "App config path changed"