latest version from TX for 2.2, now branching to 2.6