2.14 update merge