Merge branch 'hotfix/1.2.10'
Add cp and mv to s3_sync
Merge branch 'hotfix/1.2.11' into develop