Merge branch 'bw/forking-and-threading' into maint