Query Panel relative position issue
Merge branch 'echo_local'
Merge branch 'local'