Merge branch 'feature/7976_replace_flatabs_with_python' into develop