Merge pull request #397 from tkolhar/master

Added Test for ID 267658