Merge "en_US.UTF-8 is also supported." into lmp-dev