Fixed performance regression.
Merge commit 'e4b0f0a5bab1e3b5187e5021e26ffb66af436245'