Merge commit 'a905d9551103c5be465429ffeb0352b78058457e' * commit 'a905d9551103c5be465429ffeb0352b78058457e': Remove STOPSHIP and reduce log spam.
Merge commit 'a905d9551103c5be465429ffeb0352b78058457e' * commit 'a905d9551103c5be465429ffeb0352b78058457e': Remove STOPSHIP and reduce log spam.