Small changes to prepare for checking Ancho version
Finished feature 53959271/shared-ancho-improvements.