added error tracking code CDB-1573
removed test CDB-1573
Merge CDB-1573 into release/2.8.3