Merge remote-tracking branch 'origin/develop' into 1057-merge-user-and-author

16 jobs for !832 with 1057-merge-user-and-author in 49 minutes and 58 seconds (queued for 3 seconds)
latest merge request