initial haystack 2.x re-integration