Merge branch 'release/0.3.10' into develop