Pull in deployment fix from app-template.