Order comment data
Merge branch 'release/comment'