CAAERS-6294, redid it based on crucible comments.