Added support for custom cdc templates lost during 5.0 conversion