-Converted many reflection calls to use the new wrapper methods in BaseObject
Merge remote-tracking branch 'upstream/master'