Merge "Fix issue #7267494, issue #7212347" into jb-mr1-dev