Merge branch 'release/7.x-0.8' into develop
Get query from preprocess function
updated to version 7.x-0.9
Merge branch 'release/7.x-0.9'