re #10509 solve failing test
Merge branch 'feature/10509_Where_did_this_instrument_come_from' into develop