Merge "Add new strings for new features and bug fixes"