merge from p4 branch
instl 0.9.5