Merge "mutate() didn't work as advertised Bug #7162705" into jb-mr1-dev