Merge "Remove leading spaces in two messages"