am 6fb7fd3a: Merge "Fix issue #7267494, issue #7212347" into jb-mr1-dev

* commit '6fb7fd3a0939413d8968fc0d404ed499d7f7dc52':
  Fix issue #7267494, issue #7212347