merge with 1.9.2i