Merge "Make it possible to remove current user" into lmp-dev