am 1d0f35a4: merge in KQS81M

* commit '1d0f35a489fe6ea314ac9f2f2ca21b6507b41554':