Testbranch changes by wallberg

Please pull in my code changes