Code

Merge branch 'ff/oracle'