am 0123cb48: am 44e523c5: merge in KQS81M

* commit '0123cb48768675c59577cd26f4eada73cc72850a':