Removed redundant code from assign()
Housekeeping
Merge remote-tracking branch 'upstream/master'