final commit before move to 1.8.0.2