Implement a workaround to resolve duplicated ContentTypes caused by HRD ...

...inconsistencies