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

* commit 'cd09cb8fb79442aa22018db9134ef1ef22059360':
  Fix issue #7267494, issue #7212347