Merge branch 'hotfix/1.5.3' into develop
Refactoring how comments are added to the DOM
Indicate if there are no comments
Formatting
Merge branch 'release/1.5.4'