am 93c39d5d: DO NOT MERGE Fix issues during backport

* commit '93c39d5d4fe8a31da35f8d1d522acb7b676946af':
  DO NOT MERGE Fix issues during backport