Updated version

Update to upstream version 0.2.3
Apply our changes using cherry-pick