Update master fork with latest updates

Update master fork with latest updates