am 873b291b: Merge "fix issuse 65774"

* commit '873b291b15c35ae1ec7ea29de4c012275e13e761':
  fix issuse 65774