Migration backend datastore to Oracle
Merge branch 'macan' into test fot migration to Oracle.
merge again