Using soql builder
Merge from unstable
Merge pull request #782 from wmathurin/unstable

Using soql builder