Task#5920 re-implement add/reply comment