Merge "FIx build break due to API change" into main