Dev6700

merge please