merge with devel branch, but we got trouble in SerializationTest