[merge] Fix #2: sort declines/comments by date + revamp comments system