am 63af727b: Merge "Fix Issue 59989"

* commit '63af727b4b2e05ca18f1d9f5c8b4e87a6bfd5601':
  Fix Issue 59989