Sprint-53 SAT-1285,1293
resolve merge issue