Updating fork to v0.18.2.1

Merge upstream