Merge commits 'ca6a42586fae' and 'c286c419c784' into perf/urgent