Merge branch 'hotfix/1.2.4'
Update AWS package
Merge branch 'hotfix/1.2.5' into develop