Update to latest 3-0-9 dev