Pull request for issue #923

Fixes #923. Generated by conveyor-workflow.