Merge "Fix issue #7242119 and #7242008." into jb-mr1-dev