Merge branch 'master' into Generalized_server-side

Many updates in master required in branch
4 jobs for Generalized_server-side in 49 seconds (queued for 4 seconds)
latest