Changes to sync with latest upstream release v0.4.1
Changes to sync with latest v0.4.1 release from upstream repo.