comments_correction_timeout
(cherry picked from commit 0c05b5bb)
(cherry picked from commit eb019d3b)