IS-4: Fix comments.
Merge branch 'feature/IS-4'