re #10715 Added correct setting and saving of instrument and facility.
Merge branch 'feature/10715_first_time_setup_forgetful' into develop