REVIEW DEPLOY-79: ESU corrections