Merge branch 'develop' into feature/rc-interface