Forward port "Add an option to change the device hostname Merged