fixed buildExpandBindingQuery()
Merge branch '1.1-stable'