[SR-Dev] git:janakj/oracle: Merge commit 'or/cvshead' into oracle