Merge branch 'upgrade' into 'master' for deploy