Fix #5494 Make it easier to comment components