CGIV-3337 Debug