Merge "[Script] Fixed assorted string usage issues"