message query intervals restored back
Merge branch 'hotfix_0.5.1'