Updated build
Merge remote-tracking branch 'origin/spBindOnce'