Merge branch 'release/0.7.2' into develop