Merge "Fix node rebooting procedure"