Merge pull request #434 from tkolhar/master

Added test for ID 274319