Merge "Fix strings" into jb-mr1-dev