Merge branch 'dev'
New way inheritance
Merge branch 'devstream/master'
Added some operations
Merge branch 'devstream/master'
andop, orop, beginwheregroup, endwheregroup
Merge branch 'dev'