Merge branch 'upgrade-comeonin' into 'develop'