DOC-2595: Apply comments in crucible