Merge pull request #23797 from arjantijms/jdbc_cleaning_2

JDBC cleaning 2