Merge branch 'hotfix/4702'

Close #4702
add @todo docblock
Merge branch 'hotfix/4688' into develop

Forward port #4688