Merge branch 'topic/workq-update' into topic/misc