Merge branch 'develop' into feature/ROYALE_INTERFACE_INFO