Merge remote-tracking branch 'origin/2.2-dev' into 132-httpReplaceWithHttps

5 jobs for 132-httpReplaceWithHttps in 1 minute and 19 seconds (queued for 1 second)