fix dry-run
Merge branch 'develop'