Merge branch 'bugfix/10546_new_BASIS_deffile' into develop
Merge branch 'bugfix/10546_new_BASIS_deffile' into develop
Merge branch 'feature/8911_multi_data_fititng' into develop