Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'