merge with 1.6