Merge "Fix NewApi warning" into main