Merge branch 'release/0.10.4' into develop
Update testing modules
Merge branch 'develop'