Always allow to update the name if requested
Merge branch 'MH-810' into dev