Merge remote-tracking branch 'origin/master' into caching (reverted from commit 00a11fe4cc1d55c0aea263a7a07df691578fca49)