am 6db3ad50: merge in KQS81M

* commit '6db3ad507e4a572c294915a02277c0befeb7be99':