[MAT-403] respond to PR comments.