Issue2647

@mohit-agarwal - I am opening a new PR to address #2647, this is your PR with some tests included. How does this look to you?