backport release scripts
guard on release.sh
guard on release.sh
Merge branch 'develop'
fix conflict