Updates with latest changes from parent fork