Feature/ami 506 post proxy

pleasereview @edrabbit @declanshanaghy