Merge "Fix previous changes." into jb-mr2-dev