Fixes related to G. Passos suggestions Re #7059
Merge branch 'feature/7059_load_psi_focus_instrument' into develop