Merge pull request #21692 from demeritcowboy/dbssl