Merge "Strings for next change" into lmp-dev