Merge branch 'check-if-user-enabled' into develop