HTML-540 - Additional comment per code review