DBI-1.623 updates - patches still required and tested okay