Merge branch 'develop' into 'develop'

Improve security

Closes #5985 and #5984

See merge request !1380
1 job for 5989-remote-user-logins-not-working in 11 seconds (queued for 1 second)