Fix merge problems that have wiped out getIndentity/setIndentity changes
Fix merge problems that have wiped out getIndentity/setIndentity changes

maier49/dstore,kfranqueiro/dstore,maier49/dstore,kfranqueiro/dstore,maier49/dstore,kfranqueiro/dstore,maier49/dstore,kfranqueiro/dstore