merge with 1.8d