Always allow to update the name if requested
Merge pull request #242 from CruGlobal/MH-810

Always allow to update the name if requested
Merge branch 'MH-637' into MH-637-tt