Merge branch 'ws/request-pull-code-cleanup' into maint