Merge branch 'feature/remote-user-deactivation' into 'develop'