Pull request for issue #1497

Fixes #1497. Generated by conveyor-workflow.