describe ami-proxy workaround in troubleshooting section
Merge remote-tracking branch 'origin/ami-proxy'