tag 0.67

r16182