A couple of missing comments and TODOs
Merge branch 'develop'