Merge pull request #473 from walmartlabs/user/eran

0.13.2