fix issue CAT-1061

fix issue CAT-1061

fix issue CAT-1061

removed unused variable
Fix issue CAT-1061 and integrate