Make compatibility explicit.

[finishes #47410733]
[finishes #47386603]