Merge master from project to current

We should update our base to have the current commits