Pull request for issue #1235

Fixes #1235. Generated by conveyor-workflow.