Merge remote-tracking branch 'origin/master' into 4595_slowdown (fixing test)