merge validation2 and model 3.5 into trunk