Merge data mapper engine changes (committed by Susanka) from svn to git.