Merge "add new string IDs" into 2.0_beta