Merge branch '2.2-dev' into versionFooter

2 jobs for versionFooter in 1 minute and 14 seconds (queued for 2 seconds)