Merge "Rename email extra." into lmp-dev