Merge branch 'feature/mrf-user-filter' into 'develop'