Update todo backports from master branch
Merge pull request #3 from cala/proper

Update todo backports from master branch