Merge branch 'CONFIG-LOCATION-CMP0026' into release