am fe6b1db1: Merge from jb-mr1-aah-dev

* commit 'fe6b1db1084812a5041756cee360bcaaab79d754':