Pull request for issue #1097

Fixes #1097. Generated by conveyor-workflow.