Merge "Update builder nodes"