sync with adak-devel