diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
index 8b417b8ea88..341cb8ac466 100644
--- a/config/checkstyle_checks.xml
+++ b/config/checkstyle_checks.xml
@@ -425,6 +425,21 @@
       <message key="matchxpath.match"
                value="Avoid using deprecated method 'DetailAst.branchContains()'."/>
     </module>
+    <module name="MatchXpath">
+      <property name="id" value="singleLineCommentStartWithSpace"/>
+      <property name="query"
+                value="//SINGLE_LINE_COMMENT[./COMMENT_CONTENT[not(starts-with(@text, ' '))
+                       and not(@text = '\n') and not(ends-with(@text, '//\n')) ]]"/>
+      <message key="matchxpath.match" value="Single line comment text should start with space."/>
+    </module>
+    <module name="MatchXpath">
+      <property name="id" value="blockCommentStartWithSpace"/>
+      <property name="query"
+                value="//BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT[matches(@text, '\\n+ *\*[^\\n ]\S')
+                       or matches(@text, '^[^\* \\n]') and not(starts-with(@text, '*'))]]"/>
+      <message key="matchxpath.match"
+               value="Block comment text should start with space after asterisk."/>
+    </module>
     <module name="MissingCtor">
       <!--
         we will not use that fanatic validation, extra code is not good
@@ -677,12 +692,6 @@
     <module name="TodoComment">
       <property name="format" value="(TODO)|(FIXME)" />
     </module>
-    <!-- till https://github.com/checkstyle/checkstyle/issues/8137 -->
-    <module name="TodoComment">
-      <property name="id" value="commentStartWithSpace"/>
-      <property name="format" value="^([^\s\/*])"/>
-      <message key="todo.match" value="Comment text should start with space."/>
-    </module>
     <module name="TrailingComment"/>
     <module name="UncommentedMain">
       <property name="excludedClasses" value="\.(Main|JavadocPropertiesGenerator)$"/>