Merge Oracle test fixes to 2.4 branch
Merge origin/2.4 into local branch