Merge remote-tracking branch 'origin/master' into feature/8467_icat_contract_gui
Convert grid to frames. Better layout management. Refs #8467.
Merge branch 'feature/8467_icat_contract_gui' into develop