Merge branch 'feature/EMR-1' into develop