squashing bugs in manage keywords tree, fixes #7909
Merge branch 'dev' into test