Merge "Update arm nodes"