I43: Implement comments

Reviewed and approved. Please, merge into master.