Merge branch 'release/0.60' into develop
Merge remote-tracking branch 'upstream/develop' into develop