workshop3 update
Merge branch 'issue-4444'