BS-7723
Add condition expression validation