am 718f0835: merge in KQS81M

* commit '718f083598885f56e49d1846dab0f37607ef33d7':