Merging the changes for jackson mapping fix