FORGE-1683 - Updated comments.