Merge branch 'release/2.3' into develop
Moved helper functions
Merge branch 'hotfix/2.3.1' into develop
Small glitch in wave download (2)
Merge branch 'develop'