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

* commit 'aea4b79de103729df9b7aa7f4975dd6470cde0ac':