Updating from the official repo

Merge conflicts