Merged b2448 into trunk, passes test4