Merge branch '1069-fetch-filters-in-general-adapter' into 1069