Merge "Add ability to AND and OR conditions together" into tm-qpr-dev