checkpoints services improvements (step4)
Merge remote-tracking branch 'origin/poc_ora' into poc_ora