[MAT-355] respond to PR comments.