Fixes #5929 - Remove a page recursively
Merge branch 'hotfix/6077'

Close #6077
Fixes #6076
Merge pull request #6085 from froschdesign/hotfix/5929

Fixes #5929 - Remove a page recursively
Merge branch 'hotfix/6085' into develop

Forward port #6085