Applied changes from this PR to master only since 5.0 doesn't have the AttributeConverterDescriptorImpl class.