HAMA-681: updates the comments.