Merge pull request #39 from abokth/backport-c2ea171a-to-1-5