[[ Bug 13455 ]] Don't clear the context in getentries_for_folder - do so in getentries.
Merge branch 'bugfix-13455' into release-6.6.4
Merge branch 'release-6.6.4' into develop