Merge commit '0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8' into kraken * commit '0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8': Fix bug 2604132 40s skip after undocking
Merge commit '0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8' into kraken * commit '0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8': Fix bug 2604132 40s skip after undocking