Merge branch 'master' into sec08
add rql and its test
Merge branch 'sec08'