remove todo from code, replace with issue in GH
Merge branch 'master' into design/40-all-methods-collapse