Merge commit 'release-1.0' into develop