Merge "Fix bug #7172699" into jb-mr1-dev