Updating the friendly name when the master is reconfigured
Merge branch 'friendlyBuilderName' into staging