Fix wrong class name
Merge branch 'Development_main_addons' into extDB_beta_addons