Merge "Rename delegate to delegateNode" into main