Merge commit 'bf6913481eff68a69d1e6ba312227e2fcea29793' into kraken * commit 'bf6913481eff68a69d1e6ba312227e2fcea29793': Cherry pick from master. Cherry pick from master.
Merge commit 'bf6913481eff68a69d1e6ba312227e2fcea29793' into kraken * commit 'bf6913481eff68a69d1e6ba312227e2fcea29793': Cherry pick from master. Cherry pick from master.