merge B708 update