Synchronized with latest changes, which fix the memory leak on relational mapper data insertion.