Cache individual comments on comment list
Merge conflicts
Merge branch 'feature/jmbo_108' into develop