Merge branch 'hotfix/2.4.1' into develop
More exports
Merge branch 'release/2.4.2'