Merge commit '994e39908b167fb70883ce6c1146433e0486e86f' into kraken * commit '994e39908b167fb70883ce6c1146433e0486e86f': Fix issue #2621809: Kill! Kill! Kill!