rsim/oracle-enhanced

Restore #1208 and #1209
#1212

yahonda wants to merge yahonda:restore_1208_and_1209 into rsim:master

Compare on GitHub

We do not currently have an analysis of these two commits