am 710e96ac: merge in KQS81M

* commit '710e96acab5be36d98876570e81a49bccff8ae33':