Merge "Fix deprecation message" into main