BS-11798
Add BackwardConverter fixes
Remove duplicated code