As per Evgeny (SonarSource) request