Merge branch 'dm-visibility-for-blocking-users' into 'develop'