Update the testbranch with latest fixes