am 60ebd88c: Merge from jb-mr1-aah-dev

* commit '60ebd88c6a8e66eb59f9de5fcf5a52d164fb406d':