Workpattern New Year fix
Merge branch 'hotfix/workpattern'