fix empty priority queue state
Merge branch 'hotfix/4198'

Close #4198
Merge pull request #4199 from robertboloc/#4172-fix

 Issue #4172 - Fixed empty priority queue state
Merge branch 'hotfix/4199' into develop

Forward port #4199