Merge branch 'jc/apply-ws-prefix' into maint