am 52177738: Merge "Fix issue #7296314, issue #7296314." into jb-mr1-dev

* commit '52177738e8fa38e2f7769db1bcad40e7405baf17':
  Fix issue #7296314, issue #7296314.