Merge "Properly deprecate the SpecialVersionExtensionTypes hook"