Merge "Improve "selfmove" message's wording"