Merge "Update master switch style"