fixed partial update issue (removed nested "set" call)
Merge remote-tracking branch 'origin/master'