Merge commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe' into kraken * commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe': Fix 2578016.
Merge commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe' into kraken * commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe': Fix 2578016.