Pull request for issue #1223

Fixes #1223. Generated by conveyor-workflow.