Pull request for issue #1233

Fixes #1233. Generated by conveyor-workflow.