Query Builder v3.12

Query Builder v3.12