Pull request for issue #1243

Fixes #1243. Generated by conveyor-workflow.