Merge branch 'feature/rum-config-generator' into 'develop'