Pull request for issue #502

Fixes #502. Generated by conveyor-workflow.