Pull request for issue #1297

Fixes #1297. Generated by conveyor-workflow.