Update the fork base

Updating the fork base to the latest development