Merge branch 'develop' into feature/GH-1517_dynamic-UI-rendering to b…
9c2c7a4
…ring feature branch up to date with develop