Merge pull request #421 from ab268/master

Changes for Case:251945
Added Test for ID 274317
Added Test for ID 274317
Merge pull request #423 from tkolhar/master

Added test for ID 274317