Add TCDB fix bundle

Ref: Redmine#4169