Port CMP0026 change to master.
Merge topic 'CONFIG-LOCATION-CMP0026-for-master' into next

8bd424df Port CMP0026 change to master.