#37 Deployment adaptations