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