Pull request for issue #1423

Fixes #1423. Generated by conveyor-workflow.