Merge branch 'fix-statement-splitter-oracle' into dev_oracle