Intermediate commit - impl of hasOne binding
Merge remote-tracking branch 'origin/master'