integrated changes from d23c57d into BaseObject