Merge "Fix string reference usage"