dar vienas cherry pick test from X1.5.6.x

dar vienas cherry pick test from X1.5.6.x