Dev oracle sherlock See merge request root/atms!141
Dev oracle sherlock See merge request root/atms!140