Addresses Old bugs 2,3,9, New bug 1, Enhancement 24 [1074]
Merge remote-tracking branch 'upstream/master'