sync with devel changes -- tests pass again