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