Fix #5494 Make it easier to comment components
Merge pull request #5509 from rvinay88/master

Fix #5494 Make it easier to comment components