Merge "Fix incorrect tests Bug #7262921 Bug #7198966 Bug #7203333" into jb-mr1-dev