Merge commit 'ea37d9b489aac1a4a8de71887581fe712e26e144' into kraken * commit 'ea37d9b489aac1a4a8de71887581fe712e26e144': Fix bug 2670395 and 2599698
Merge commit 'ea37d9b489aac1a4a8de71887581fe712e26e144' into kraken * commit 'ea37d9b489aac1a4a8de71887581fe712e26e144': Fix bug 2670395 and 2599698