Merge branch 'master' into feature/Hdf5HistoryPoints

Updated branch before merge
71 jobs for !1397 with feature/Hdf5HistoryPoints in 183 minutes and 40 seconds (queued for 106 minutes and 14 seconds)
merge request