Try to fix policy thread again
Merge pull request #1787 from jamie-cyber1/fix_hatest2

Try to fix policy thread again