Merge branch 'jc/apply-ws-fix-expands' into maint