Initial 1.8.0.0 commit