am 006119bf: Merge commit \'8237dd82\' into manualmerge

* commit '006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a':
  DO NOT MERGE Fix issues during backport