Manually merging changes from 'feature/comments'.