Merge branch 'work-fixes'