Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken * commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef': Fix issue #2694643: Remove/Resolve STOPSHIP
Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken * commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef': Fix issue #2694643: Remove/Resolve STOPSHIP