Merge branch 'master' into 'dev#81845_nanook_cas_server'

Master

See merge request !2890 (merged)

Merge request reports