Warp test of RF-12717 fixed