merge closing of 2.5 branch