Idea 128531

Adding test case for IDEA-128531