BT-3578 Fixed Code Convertions