right, i was advocating doing this pr + the tigris pr into master immediately