Merge branch 'develop' into release/2_9_documentation