Merge pull request #460 from apoloval/ensure-backports

Merge release-0.1 branch into master