[Task #2797]: Reinserting code comments