Merge "Update API usage for source" into main