Update to include master changes from last few years