Backport #418 to release14

See rsim/oracle-enhanced#418 for reasoning of changes

Signed-off-by: Aleksandrs Ļedovskis <aleksandrs@ledovskis.lv>