Merge branch 'release-03.2'

As per Chris's suggestion, we consider the big merge a release.
Fix AMI id
Merge branch 'matteo-ami-hotfix' into develop

New AMI id