Verified PTIPS-3554.
Added test case for PTIPS-3617.