merge with 1.8b