Merge branch 'release/release_v0.8.3' into develop