add @todo docblock
Merge branch 'hotfix/4688'

Close #4688