[#39970349] Continue (hopefully finish) data source refactor fixes