Merge "Fix Oracle 1.23 missing patches (rebase)"