Merge "Upgrade arm nodes"