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

* commit 'de1efebdcac1bfa0e30fa7fbe0b4c7860a72a6a0':