Merge branch 'v4-0-test' into id10ts-registry