Merge branch 'feature/7394_polref_idf' into develop
Merge branch 'feature/7154_load_instrument' into develop