Make the changes specified re #9783

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
Merge branch 'feature/9783_engine_x_focus_properties' into develop