fix regress logic
Merge branch 'develop' into hotfix/fixregress
Merge branch 'hotfix/fixregress'