Merge "Use non-deprecated constructor" into main