Merge remote-tracking branch 'origin/object_oriented' into object_oriented