Merge "Cast null to Object to avoid ambiguity" into main