Merge branch 'develop' into royal
bugs
Merge branch 'royal' into develop