merge validation commits r23146, r23162, r23163 into trunk