Mac_OSX commit after database operations
Merge with Mac_OSX after Mac database ops