Backports https://github.com/pommi/CGP/commit/d21f4a765b82e4c02ff15bf730b0e1f0d68d5471
Allow usage of extra types_db
Backport https://github.com/pommi/CGP/commit/056714a29721f1332f2497e440654f6735055d67
Backport https://github.com/pommi/CGP/commit/216e492f32ab9a23e9b345e2bf424ba15025aec4
Merge branch '2.30'