Merge "Get strings in" into jb-mr1-dev