Merge "Docs: add a message to already-deprecated API" into main