CORE-4190, CORE-4201
Small update to callback converter