Merge branch 'comment-permalink-replace' into sun