Merge commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f' into kraken * commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f': Fixing bugs 2577511 and 2581920.
Merge commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f' into kraken * commit '8c8185b2606f3a232e4498b1128ca7bdecc3628f': Fixing bugs 2577511 and 2581920.