TDI-30488:commmit a error class,revert it.
Merge branch 'maintenance/5.6'