changes required to fix basic select operator
Merge branch 'develop' of github.com:milinda/Freshet into develop