DEVOPS-448: defer usage fix