issue #20906: implemented more of the spec