Merge "Clarify deprecation message"