sync with active development