am 02c400f4: Merge from jb-mr1-aah-dev

* commit '02c400f4d7a632b962d38d4c5a25ab576101de3e':