fix multiple bug for release
merge