Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev