Add TCDB Fix bundle

Ref: Redmine#4169