Merge "Configurable fixed network name"