Updating Dev branch

Update to latest 3-0-7 dev