[DF-2136]  implement issue