Merge "Bowing my head in shame Bug #6924514" into jb-mr1-dev