diff --git a/change_notes/2025-02-13-deviations.md b/change_notes/2025-02-13-deviations.md
new file mode 100644
index 0000000000..fb01cdf596
--- /dev/null
+++ b/change_notes/2025-02-13-deviations.md
@@ -0,0 +1,13 @@
+ - A new in code deviation format has been introduced, using the C/C++ attribute syntax:
+   ```
+   [[codeql::<standard>_deviation("<code-identifier>")]]
+   ```
+   This can be applied to functions, statements and variables to apply a deviation from the Coding Standards configuration file. The user manual has been updated to describe the new format.
+ - For those codebases that cannot use standard attributes, we have also introduced a comment based syntax
+   ```
+   // codeql::<standard>_deviation(<code-identifier>)
+   // codeql::<standard>_deviation_next_line(<code-identifier>)
+   // codeql::<standard>_deviation_begin(<code-identifier>)
+   // codeql::<standard>_deviation_end(<code-identifier>)
+   ```
+   Further information is available in the user manual.
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/Exclusions.qll b/cpp/common/src/codingstandards/cpp/Exclusions.qll
index b718f6535d..e6a477b220 100644
--- a/cpp/common/src/codingstandards/cpp/Exclusions.qll
+++ b/cpp/common/src/codingstandards/cpp/Exclusions.qll
@@ -35,19 +35,14 @@ predicate isExcluded(Element e, Query query, string reason) {
     ) and
     reason = "Query has an associated deviation record for the element's file."
     or
-    // The element is on the same line as a suppression comment
-    exists(Comment c |
-      c = dr.getACodeIdentifierComment() and
-      query = dr.getQuery()
-    |
-      exists(string filepath, int endLine |
-        // Comment occurs on the same line as the end line of the element
-        e.getLocation().hasLocationInfo(filepath, _, _, endLine, _) and
-        c.getLocation().hasLocationInfo(filepath, endLine, _, _, _)
-      )
-    ) and
-    reason =
-      "Query has an associated deviation record with a code identifier that is applied to the element."
+    // The element is annotated by a code identifier that deviates this rule
+    exists(CodeIdentifierDeviation deviationInCode |
+      dr.getQuery() = query and
+      deviationInCode = dr.getACodeIdentifierDeviation() and
+      deviationInCode.isElementMatching(e) and
+      reason =
+        "Query has an associated deviation record with a code identifier that is applied to the element."
+    )
   )
   or
   // The effective category of the query is 'Disapplied'.
diff --git a/cpp/common/src/codingstandards/cpp/deviations/CodeIdentifierDeviation.qll b/cpp/common/src/codingstandards/cpp/deviations/CodeIdentifierDeviation.qll
new file mode 100644
index 0000000000..310a2b678b
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/deviations/CodeIdentifierDeviation.qll
@@ -0,0 +1,361 @@
+/**
+ * A module for identifying in code markers in code that trigger deviations.
+ *
+ * This module supports two different code identifier markers:
+ *  - A C/C++ attribute based syntax
+ *  - A comment-based format
+ *
+ * The C/C++ attribute based syntax uses the following format:
+ * ```
+ * [[codeql::<standard>_deviation("code-identifier")]]
+ * ```
+ * The deviation will be applied to the selected program element, and any syntactically nested children of that program element.
+ *
+ * For the comment format the marker consists of a `code-identifier` with some optional annotations. A deviation will be applied to
+ * some range of lines in the file containing the comment based on the annotation. The supported marker annotation
+ * formats are:
+ *  - `<code-identifier>` - the deviation applies to results on the current line.
+ *  - `codeql::<standard>_deviation(<code-identifier>)` - same as above.
+ *  - `codeql::<standard>_deviation_next_line(<code-identifier>)` - this deviation applies to results on the next line.
+ *  - `codeql::<standard>_deviation_begin(<code-identifier>)` - marks the beginning of a range of lines where the deviation applies.
+ *  - `codeql::<standard>_deviation_end(<code-identifier>)` - marks the end of a range of lines where the deviation applies.
+ *
+ * The valid `code-identifier`s are specified in deviation records, which also specify the query whose results are
+ * suppressed by the deviation.
+ *
+ * For begin/end, we maintain a stack of begin markers. When we encounter an end marker, we pop the stack to determine
+ * the range of that begin/end marker. If the stack is empty, the end marker is considered unmatched and invalid. If
+ * the stack is non-empty at the end of the file, all the begin markers are considered unmatched and invalid.
+ *
+ * Begin/end markers are not valid across include boundaries, as the stack is not maintained across files.
+ */
+
+import cpp
+import Deviations
+
+string supportedStandard() { result = ["misra", "autosar", "cert"] }
+
+/**
+ * Holds if the given comment contains the code identifier.
+ */
+bindingset[codeIdentifier]
+private predicate commentMatches(Comment comment, string codeIdentifier) {
+  exists(string text |
+    comment instanceof CppStyleComment and
+    // strip the beginning slashes
+    text = comment.getContents().suffix(2).trim()
+    or
+    comment instanceof CStyleComment and
+    // strip both the beginning /* and the end */ the comment
+    exists(string text0 |
+      text0 = comment.getContents().suffix(2) and
+      text = text0.prefix(text0.length() - 2).trim()
+    ) and
+    // The /* */ comment must be a single-line comment
+    not text.matches("%\n%")
+  |
+    // Code identifier appears at the start of the comment (modulo whitespace)
+    text.prefix(codeIdentifier.length()) = codeIdentifier
+    or
+    // Code identifier appears at the end of the comment (modulo whitespace)
+    text.suffix(text.length() - codeIdentifier.length()) = codeIdentifier
+  )
+}
+
+/**
+ * A deviation marker in the code.
+ */
+abstract class CommentDeviationMarker extends Comment {
+  DeviationRecord record;
+
+  /**
+   * Gets the deviation record associated with this deviation marker.
+   */
+  DeviationRecord getRecord() { result = record }
+}
+
+/**
+ * A deviation marker in a comment that is not a valid deviation marker.
+ */
+class InvalidCommentDeviationMarker extends Comment {
+  InvalidCommentDeviationMarker() {
+    not this instanceof CommentDeviationMarker and
+    commentMatches(this, "codeql::" + supportedStandard() + "_deviation")
+  }
+}
+
+/**
+ * A deviation marker for a deviation that applies to the current line.
+ */
+class DeviationEndOfLineMarker extends CommentDeviationMarker {
+  DeviationEndOfLineMarker() {
+    commentMatches(this,
+      "codeql::" + supportedStandard() + "_deviation(" + record.getCodeIdentifier() + ")")
+  }
+}
+
+/**
+ * A deviation marker for a deviation that applies to the next line.
+ */
+class DeviationNextLineMarker extends CommentDeviationMarker {
+  DeviationNextLineMarker() {
+    commentMatches(this,
+      "codeql::" + supportedStandard() + "_deviation_next_line(" + record.getCodeIdentifier() + ")")
+  }
+}
+
+/**
+ * A deviation marker for a deviation that applies to a range of lines
+ */
+abstract class CommentDeviationRangeMarker extends CommentDeviationMarker { }
+
+/**
+ * A deviation marker for a deviation that begins on this line.
+ */
+class DeviationBegin extends CommentDeviationRangeMarker {
+  DeviationBegin() {
+    commentMatches(this,
+      "codeql::" + supportedStandard() + "_deviation_begin(" + record.getCodeIdentifier() + ")")
+  }
+}
+
+/**
+ * A deviation marker for a deviation that ends on this line.
+ */
+class DeviationEnd extends CommentDeviationRangeMarker {
+  DeviationEnd() {
+    commentMatches(this,
+      "codeql::" + supportedStandard() + "_deviation_end(" + record.getCodeIdentifier() + ")")
+  }
+}
+
+private predicate hasDeviationCommentFileOrdering(
+  DeviationRecord record, CommentDeviationRangeMarker comment, File file, int index
+) {
+  comment =
+    rank[index](CommentDeviationRangeMarker c |
+      c.getRecord() = record and
+      file = c.getFile()
+    |
+      c order by c.getLocation().getStartLine(), c.getLocation().getStartColumn()
+    )
+}
+
+/**
+ * Calculate the stack of deviation begin markers related to the given deviation record, in the given file,
+ * at the given `markerRecordFileIndex` into the list of deviation markers for that record in that file.
+ */
+private BeginStack calculateBeginStack(DeviationRecord record, File file, int markerRecordFileIndex) {
+  // Stack is empty at the start
+  markerRecordFileIndex = 0 and
+  result = TEmptyBeginStack() and
+  // Only initialize when there is at least one such comment marker for this file and record
+  // pairing
+  exists(CommentDeviationRangeMarker marker |
+    marker.getRecord() = record and marker.getLocation().getFile() = file
+  )
+  or
+  // Next token is begin, so push it to the stack
+  exists(DeviationBegin begin, BeginStack prev |
+    record = begin.getRecord() and
+    hasDeviationCommentFileOrdering(record, begin, file, markerRecordFileIndex) and
+    prev = calculateBeginStack(record, file, markerRecordFileIndex - 1) and
+    result = TConsBeginStack(begin, prev)
+  )
+  or
+  // Next token is end
+  exists(DeviationEnd end, BeginStack prevStack |
+    record = end.getRecord() and
+    hasDeviationCommentFileOrdering(record, end, file, markerRecordFileIndex) and
+    prevStack = calculateBeginStack(record, file, markerRecordFileIndex - 1)
+  |
+    // There is, so pop the most recent begin off the stack
+    prevStack = TConsBeginStack(_, result)
+    or
+    // Error, no begin on the stack, ignore the end and continue
+    prevStack = TEmptyBeginStack() and
+    result = TEmptyBeginStack()
+  )
+}
+
+newtype TBeginStack =
+  TConsBeginStack(DeviationBegin begin, TBeginStack prev) {
+    exists(File file, int index |
+      hasDeviationCommentFileOrdering(begin.getRecord(), begin, file, index) and
+      prev = calculateBeginStack(begin.getRecord(), file, index - 1)
+    )
+  } or
+  TEmptyBeginStack()
+
+/**
+ * A stack of begin markers that occur in the same file, referring to the same record.
+ */
+private class BeginStack extends TBeginStack {
+  /** Gets the top begin marker on the stack. */
+  DeviationBegin peek() { this = TConsBeginStack(result, _) }
+
+  string toString() {
+    exists(DeviationBegin begin, BeginStack prev | this = TConsBeginStack(begin, prev) |
+      result = "(" + begin + ", " + prev.toString() + ")"
+    )
+    or
+    this = TEmptyBeginStack() and
+    result = "()"
+  }
+}
+
+predicate isDeviationRangePaired(DeviationRecord record, DeviationBegin begin, DeviationEnd end) {
+  exists(File file, int index |
+    record = end.getRecord() and
+    hasDeviationCommentFileOrdering(record, end, file, index) and
+    begin = calculateBeginStack(record, file, index - 1).peek()
+  )
+}
+
+/**
+ * A standard attribute that either deviates a result.
+ */
+class DeviationAttribute extends StdAttribute {
+  DeviationRecord record;
+
+  DeviationAttribute() {
+    this.hasQualifiedName("codeql", supportedStandard() + "_deviation") and
+    // Support multiple argument deviations
+    "\"" + record.getCodeIdentifier() + "\"" = this.getAnArgument().getValueText()
+  }
+
+  DeviationRecord getADeviationRecord() { result = record }
+
+  pragma[nomagic]
+  Element getASuppressedElement() {
+    result.(Type).getAnAttribute() = this
+    or
+    result.(Stmt).getAnAttribute() = this
+    or
+    result.(Variable).getAnAttribute() = this
+    or
+    result.(Function).getAnAttribute() = this
+    or
+    result.(Expr).getEnclosingStmt() = this.getASuppressedElement()
+    or
+    result.(Stmt).getParentStmt() = this.getASuppressedElement()
+    or
+    result.(Stmt).getEnclosingFunction() = this.getASuppressedElement()
+    or
+    result.(LocalVariable) = this.getASuppressedElement().(DeclStmt).getADeclaration()
+    or
+    result.(Function).getDeclaringType() = this.getASuppressedElement()
+    or
+    result.(Variable).getDeclaringType() = this.getASuppressedElement()
+    or
+    exists(LambdaExpression expr |
+      expr = this.getASuppressedElement() and
+      result = expr.getLambdaFunction()
+    )
+    or
+    exists(Function f |
+      f = this.getASuppressedElement() and
+      // A suppression on the function should apply to the noexcept expression
+      result = f.getADeclarationEntry().getNoExceptExpr()
+    )
+  }
+}
+
+/**
+ * A deviation attribute that is not associated with any deviation record.
+ */
+class InvalidDeviationAttribute extends StdAttribute {
+  string unknownCodeIdentifier;
+
+  InvalidDeviationAttribute() {
+    this.hasQualifiedName("codeql", supportedStandard() + "_deviation") and
+    "\"" + unknownCodeIdentifier + "\"" = this.getAnArgument().getValueText() and
+    not exists(DeviationRecord record | record.getCodeIdentifier() = unknownCodeIdentifier)
+  }
+
+  string getAnUnknownCodeIdentifier() { result = unknownCodeIdentifier }
+}
+
+newtype TCodeIndentifierDeviation =
+  TSingleLineDeviation(DeviationRecord record, Comment comment, string filepath, int suppressedLine) {
+    (
+      commentMatches(comment, record.getCodeIdentifier()) or
+      comment.(DeviationEndOfLineMarker).getRecord() = record
+    ) and
+    comment.getLocation().hasLocationInfo(filepath, suppressedLine, _, _, _)
+    or
+    comment.(DeviationNextLineMarker).getRecord() = record and
+    comment.getLocation().hasLocationInfo(filepath, suppressedLine - 1, _, _, _)
+  } or
+  TMultiLineDeviation(
+    DeviationRecord record, DeviationBegin beginComment, DeviationEnd endComment, string filepath,
+    int suppressedStartLine, int suppressedEndLine
+  ) {
+    isDeviationRangePaired(record, beginComment, endComment) and
+    beginComment.getLocation().hasLocationInfo(filepath, suppressedStartLine, _, _, _) and
+    endComment.getLocation().hasLocationInfo(filepath, suppressedEndLine, _, _, _)
+  } or
+  TCodeIdentifierDeviation(DeviationRecord record, DeviationAttribute attribute) {
+    attribute.getADeviationRecord() = record
+  }
+
+class CodeIdentifierDeviation extends TCodeIndentifierDeviation {
+  /** The deviation record associated with the deviation comment. */
+  DeviationRecord getADeviationRecord() {
+    this = TSingleLineDeviation(result, _, _, _)
+    or
+    this = TMultiLineDeviation(result, _, _, _, _, _)
+    or
+    this = TCodeIdentifierDeviation(result, _)
+  }
+
+  /**
+   * Holds if the given element is matched by this code identifier deviation.
+   */
+  bindingset[e]
+  pragma[inline_late]
+  predicate isElementMatching(Element e) {
+    exists(string filepath, int elementLocationStart |
+      e.getLocation().hasLocationInfo(filepath, elementLocationStart, _, _, _)
+    |
+      exists(int suppressedLine |
+        this = TSingleLineDeviation(_, _, filepath, suppressedLine) and
+        suppressedLine = elementLocationStart
+      )
+      or
+      exists(int suppressedStartLine, int suppressedEndLine |
+        this = TMultiLineDeviation(_, _, _, filepath, suppressedStartLine, suppressedEndLine) and
+        suppressedStartLine < elementLocationStart and
+        suppressedEndLine > elementLocationStart
+      )
+    )
+    or
+    exists(DeviationAttribute attribute |
+      this = TCodeIdentifierDeviation(_, attribute) and
+      attribute.getASuppressedElement() = e
+    )
+  }
+
+  string toString() {
+    exists(string filepath |
+      exists(int suppressedLine |
+        this = TSingleLineDeviation(_, _, filepath, suppressedLine) and
+        result =
+          "Deviation record " + getADeviationRecord() + " applied to " + filepath + " Line " +
+            suppressedLine
+      )
+      or
+      exists(int suppressedStartLine, int suppressedEndLine |
+        this = TMultiLineDeviation(_, _, _, filepath, suppressedStartLine, suppressedEndLine) and
+        result =
+          "Deviation record " + getADeviationRecord() + " applied to " + filepath + " Line" +
+            suppressedStartLine + ":" + suppressedEndLine
+      )
+    )
+    or
+    exists(DeviationAttribute attribute |
+      this = TCodeIdentifierDeviation(_, attribute) and
+      result = "Deviation record " + getADeviationRecord() + " applied to " + attribute
+    )
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/deviations/Deviations.qll b/cpp/common/src/codingstandards/cpp/deviations/Deviations.qll
index 99b9a33fe6..e8c030cdd4 100644
--- a/cpp/common/src/codingstandards/cpp/deviations/Deviations.qll
+++ b/cpp/common/src/codingstandards/cpp/deviations/Deviations.qll
@@ -8,6 +8,7 @@ import cpp
 import semmle.code.cpp.XML
 import codingstandards.cpp.exclusions.RuleMetadata
 import codingstandards.cpp.Config
+import CodeIdentifierDeviation
 
 predicate applyDeviationsAtQueryLevel() {
   not exists(CodingStandardsReportDeviatedAlerts reportDeviatedResults |
@@ -219,32 +220,8 @@ class DeviationRecord extends XmlElement {
     else result = getADeviationPermit().getCodeIdentifier()
   }
 
-  /** Gets a comment which starts or ends with the code identifier comment. */
-  Comment getACodeIdentifierComment() {
-    exists(string text |
-      (
-        result instanceof CppStyleComment and
-        // strip the beginning slashes
-        text = result.getContents().suffix(2).trim()
-        or
-        result instanceof CStyleComment and
-        // strip both the beginning /* and the end */ the comment
-        exists(string text0 |
-          text0 = result.getContents().suffix(2) and
-          text = text0.prefix(text0.length() - 2).trim()
-        ) and
-        // The /* */ comment must be a single-line comment
-        not text.matches("%\n%")
-      ) and
-      (
-        // Code identifier appears at the start of the comment (modulo whitespace)
-        text.prefix(getCodeIdentifier().length()) = getCodeIdentifier()
-        or
-        // Code identifier appears at the end of the comment (modulo whitespace)
-        text.suffix(text.length() - getCodeIdentifier().length()) = getCodeIdentifier()
-      )
-    )
-  }
+  /** Gets a code identifier deviation in code which starts or ends with the code identifier comment. */
+  CodeIdentifierDeviation getACodeIdentifierDeviation() { this = result.getADeviationRecord() }
 
   /** Gets the `rule-id` specified for this record, if any. */
   private string getRawRuleId() { result = getAChild("rule-id").getTextValue() }
diff --git a/cpp/common/src/codingstandards/cpp/deviations/DeviationsSuppression.qhelp b/cpp/common/src/codingstandards/cpp/deviations/DeviationsSuppression.qhelp
deleted file mode 100644
index 0bf3a3a71b..0000000000
--- a/cpp/common/src/codingstandards/cpp/deviations/DeviationsSuppression.qhelp
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE qhelp PUBLIC "-//Semmle//qhelp//EN" "qhelp.dtd">
-<qhelp>
-    <overview>
-        <p>This query generates suppression information for rules that have an associated deviation record.</p>
-    </overview>
-    <references>
-        <li>
-            MISRA Compliance 2020 document:
-            <a href="https://www.misra.org.uk/app/uploads/2021/06/MISRA-Compliance-2020.pdf">Chapter 4.2 (page 12) - Deviations.</a>
-        </li>
-    </references>
-</qhelp>
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/deviations/DeviationsSuppression.ql b/cpp/common/src/codingstandards/cpp/deviations/DeviationsSuppression.ql
deleted file mode 100644
index 9035b7d288..0000000000
--- a/cpp/common/src/codingstandards/cpp/deviations/DeviationsSuppression.ql
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * @name Deviation suppression
- * @description Generates information about files and locations where certain alerts should be considered suppressed by deviations.
- * @kind alert-suppression
- * @id cpp/coding-standards/deviation-suppression
- */
-
-import cpp
-import Deviations
-
-/** Holds if `lineNumber` is an indexed line number in file `f`. */
-private predicate isLineNumber(File f, int lineNumber) {
-  exists(Location l | l.getFile() = f |
-    l.getStartLine() = lineNumber
-    or
-    l.getEndLine() = lineNumber
-  )
-}
-
-/** Gets the last line number in `f`. */
-private int getLastLineNumber(File f) { result = max(int lineNumber | isLineNumber(f, lineNumber)) }
-
-/** Gets the last column number on the last line of `f`. */
-int getLastColumnNumber(File f) {
-  result =
-    max(Location l |
-      l.getFile() = f and
-      l.getEndLine() = getLastLineNumber(f)
-    |
-      l.getEndColumn()
-    )
-}
-
-newtype TDeviationScope =
-  TDeviationRecordFileScope(DeviationRecord dr, File file) {
-    exists(string deviationPath |
-      dr.isDeviated(_, deviationPath) and
-      file.getRelativePath().prefix(deviationPath.length()) = deviationPath
-    )
-  } or
-  TDeviationRecordCommentScope(DeviationRecord dr, Comment c) { c = dr.getACodeIdentifierComment() }
-
-/** A deviation scope. */
-class DeviationScope extends TDeviationScope {
-  /** Gets the location at which this deviation was defined. */
-  abstract Locatable getDeviationDefinitionLocation();
-
-  /** Gets the Query being deviated. */
-  abstract Query getQuery();
-
-  abstract string toString();
-
-  abstract predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  );
-}
-
-/** A deviation scope derived from a "path" entry in a `DeviationRecord`. */
-class DeviationRecordFileScope extends DeviationScope, TDeviationRecordFileScope {
-  private DeviationRecord getDeviationRecord() { this = TDeviationRecordFileScope(result, _) }
-
-  override Locatable getDeviationDefinitionLocation() { result = getDeviationRecord() }
-
-  private File getFile() { this = TDeviationRecordFileScope(_, result) }
-
-  override Query getQuery() { result = getDeviationRecord().getQuery() }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    // In an ideal world, we would produce a URL here that informed the AlertSuppression code that
-    // the whole file was suppressed. However, experimentation suggestions the alert suppression
-    // code only works with locations with lines and columns, so we generate a location that covers
-    // the whole "indexed" file, by finding the location indexed in the database with the latest
-    // line and column number.
-    exists(File f | f = getFile() |
-      f.getLocation().hasLocationInfo(filepath, _, _, _, _) and
-      startline = 1 and
-      startcolumn = 1 and
-      endline = getLastLineNumber(f) and
-      endcolumn = getLastColumnNumber(f)
-    )
-  }
-
-  override string toString() {
-    result = "Deviation of " + getDeviationRecord().getQuery() + " for " + getFile() + "."
-  }
-}
-
-/**
- * A deviation scope derived from a comment corresponding to a "code-identifier" entry for a
- * `DeviationRecord`.
- */
-class DeviationRecordCommentScope extends DeviationScope, TDeviationRecordCommentScope {
-  private DeviationRecord getDeviationRecord() { this = TDeviationRecordCommentScope(result, _) }
-
-  private Comment getComment() { this = TDeviationRecordCommentScope(_, result) }
-
-  override Locatable getDeviationDefinitionLocation() { result = getDeviationRecord() }
-
-  override Query getQuery() { result = getDeviationRecord().getQuery() }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    getComment().getLocation().hasLocationInfo(filepath, startline, _, endline, endcolumn) and
-    startcolumn = 1
-  }
-
-  override string toString() {
-    result =
-      "Deviation of " + getDeviationRecord().getQuery() + " for comment " + getComment() + "."
-  }
-}
-
-from DeviationScope deviationScope
-select deviationScope.getDeviationDefinitionLocation(), // suppression comment
-  "// lgtm[" + deviationScope.getQuery().getQueryId() + "]", // text of suppression comment (excluding delimiters)
-  "lgtm[" + deviationScope.getQuery().getQueryId() + "]", // text of suppression annotation
-  deviationScope // scope of suppression
diff --git a/cpp/common/src/codingstandards/cpp/deviations/InvalidDeviationCodeIdentifier.md b/cpp/common/src/codingstandards/cpp/deviations/InvalidDeviationCodeIdentifier.md
new file mode 100644
index 0000000000..364e1ae915
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/deviations/InvalidDeviationCodeIdentifier.md
@@ -0,0 +1,19 @@
+# Invalid deviation code identifier
+
+## Overview
+
+Invalid deviation markers in code have no effect on the results but may indicate confusion over which results will be suppressed. 
+
+Deviation code markers are used to suppress CodeQL Coding Standards results, following the process specified in the "MISRA Compliance 2020" document. There are a range of different deviation markers, with specific syntactic requirements. If those syntactic requirements are not met, the marker is invalid and will not be applied, which is likely contrary to developer expectations.
+
+## Recommendation
+
+Ensure the following requirements are met:
+
+ * All `codeql::<standard>_deviation_begin(..)` markers are paired with a matching `codeql::<standard>_deviation_end(..)` marker.
+ * All instances of `codeql::<standard>_deviation` in comments are correctly formatted comment markers, and reference a `code-identifier`s that is specified in a deviation record included in the analysis.
+ * All deviation attributes reference `code-identifier`s that are specified in a deviation record included in the analysis.
+
+## References
+
+* [MISRA Compliance 2020 document - Chapter 4.2 (page 12) - Deviations](https://www.misra.org.uk/app/uploads/2021/06/MISRA-Compliance-2020.pdf)
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/deviations/InvalidDeviationCodeIdentifier.ql b/cpp/common/src/codingstandards/cpp/deviations/InvalidDeviationCodeIdentifier.ql
new file mode 100644
index 0000000000..87dafbba13
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/deviations/InvalidDeviationCodeIdentifier.ql
@@ -0,0 +1,41 @@
+/**
+ * @id cpp/coding-standards/invalid-deviation-code-identifiers
+ * @name Invalid deviation code identifiers
+ * @description Deviation code identifiers must be valid.
+ * @kind problem
+ * @problem.severity error
+ */
+
+import cpp
+import CodeIdentifierDeviation
+
+predicate deviationCodeIdentifierError(Element e, string message) {
+  exists(DeviationEnd end |
+    e = end and
+    not isDeviationRangePaired(_, _, end) and
+    message = "Deviation end block is unmatched."
+  )
+  or
+  exists(DeviationBegin begin |
+    e = begin and
+    not isDeviationRangePaired(_, begin, _) and
+    message = "Deviation start block is unmatched."
+  )
+  or
+  exists(InvalidDeviationAttribute b |
+    e = b and
+    message =
+      "Deviation attribute references unknown code identifier " + b.getAnUnknownCodeIdentifier() +
+        "."
+  )
+  or
+  exists(InvalidCommentDeviationMarker m |
+    e = m and
+    message =
+      "Deviation marker does not match an expected format, or references an unknown code identifier."
+  )
+}
+
+from Element e, string message
+where deviationCodeIdentifierError(e, message)
+select e, message
diff --git a/cpp/common/test/deviations/deviations_basic_test/TypeLongDoubleUsed.expected b/cpp/common/test/deviations/deviations_basic_test/TypeLongDoubleUsed.expected
index 7b78d54892..f2cfd03dc6 100644
--- a/cpp/common/test/deviations/deviations_basic_test/TypeLongDoubleUsed.expected
+++ b/cpp/common/test/deviations/deviations_basic_test/TypeLongDoubleUsed.expected
@@ -1 +1,12 @@
+| attribute_syntax.cpp:6:15:6:17 | dd1 | Use of long double type. |
+| attribute_syntax.cpp:21:15:21:17 | d10 | Use of long double type. |
+| attribute_syntax.cpp:29:15:29:17 | d14 | Use of long double type. |
+| attribute_syntax.cpp:34:20:34:22 | d16 | Use of long double type. |
+| attribute_syntax.cpp:55:15:55:16 | d1 | Use of long double type. |
+| attribute_syntax.cpp:57:17:57:18 | d2 | Use of long double type. |
+| attribute_syntax.cpp:60:17:60:18 | d3 | Use of long double type. |
 | main.cpp:13:15:13:16 | d1 | Use of long double type. |
+| main.cpp:18:15:18:16 | d4 | Use of long double type. |
+| main.cpp:21:15:21:16 | d6 | Use of long double type. |
+| main.cpp:30:15:30:17 | d10 | Use of long double type. |
+| main.cpp:38:15:38:17 | d14 | Use of long double type. |
diff --git a/cpp/common/test/deviations/deviations_basic_test/UnusedReturnValue.expected b/cpp/common/test/deviations/deviations_basic_test/UnusedReturnValue.expected
index 7cc5d2e1ab..fc7af4b197 100644
--- a/cpp/common/test/deviations/deviations_basic_test/UnusedReturnValue.expected
+++ b/cpp/common/test/deviations/deviations_basic_test/UnusedReturnValue.expected
@@ -1,3 +1,17 @@
+| attribute_syntax.cpp:5:3:5:6 | call to getZ | Return value from call to $@ is unused. | attribute_syntax.cpp:1:5:1:8 | getZ | getZ |
+| attribute_syntax.cpp:16:5:16:8 | call to getZ | Return value from call to $@ is unused. | attribute_syntax.cpp:1:5:1:8 | getZ | getZ |
+| attribute_syntax.cpp:18:5:18:8 | call to getZ | Return value from call to $@ is unused. | attribute_syntax.cpp:1:5:1:8 | getZ | getZ |
+| attribute_syntax.cpp:24:5:24:8 | call to getZ | Return value from call to $@ is unused. | attribute_syntax.cpp:1:5:1:8 | getZ | getZ |
+| attribute_syntax.cpp:26:5:26:8 | call to getZ | Return value from call to $@ is unused. | attribute_syntax.cpp:1:5:1:8 | getZ | getZ |
+| attribute_syntax.cpp:30:3:30:6 | call to getZ | Return value from call to $@ is unused. | attribute_syntax.cpp:1:5:1:8 | getZ | getZ |
+| attribute_syntax.cpp:42:3:42:6 | call to getZ | Return value from call to $@ is unused. | attribute_syntax.cpp:1:5:1:8 | getZ | getZ |
+| attribute_syntax.cpp:49:5:49:8 | call to getZ | Return value from call to $@ is unused. | attribute_syntax.cpp:1:5:1:8 | getZ | getZ |
+| attribute_syntax.cpp:61:5:61:8 | call to getZ | Return value from call to $@ is unused. | attribute_syntax.cpp:1:5:1:8 | getZ | getZ |
 | main.cpp:12:3:12:6 | call to getX | Return value from call to $@ is unused. | main.cpp:8:5:8:8 | getX | getX |
+| main.cpp:25:3:25:6 | call to getX | Return value from call to $@ is unused. | main.cpp:8:5:8:8 | getX | getX |
+| main.cpp:27:3:27:6 | call to getX | Return value from call to $@ is unused. | main.cpp:8:5:8:8 | getX | getX |
+| main.cpp:33:3:33:6 | call to getX | Return value from call to $@ is unused. | main.cpp:8:5:8:8 | getX | getX |
+| main.cpp:35:3:35:6 | call to getX | Return value from call to $@ is unused. | main.cpp:8:5:8:8 | getX | getX |
+| main.cpp:39:3:39:6 | call to getX | Return value from call to $@ is unused. | main.cpp:8:5:8:8 | getX | getX |
 | nested/nested3/test3.h:5:3:5:7 | call to getZ3 | Return value from call to $@ is unused. | nested/nested3/test3.h:1:5:1:9 | getZ3 | getZ3 |
 | nested/test.h:5:3:5:6 | call to getY | Return value from call to $@ is unused. | nested/test.h:1:5:1:8 | getY | getY |
diff --git a/cpp/common/test/deviations/deviations_basic_test/attribute_syntax.cpp b/cpp/common/test/deviations/deviations_basic_test/attribute_syntax.cpp
new file mode 100644
index 0000000000..e363de55af
--- /dev/null
+++ b/cpp/common/test/deviations/deviations_basic_test/attribute_syntax.cpp
@@ -0,0 +1,76 @@
+int getZ() { return 5; }
+
+int alt() {
+  int x = 0;       // COMPLIANT[DEVIATED]
+  getZ();          // NON_COMPLIANT
+  long double dd1; // NON_COMPLIANT (A0-4-2)
+
+  long double [[codeql::autosar_deviation(
+      "a-0-4-2-deviation")]] dd3; // COMPLIANT[DEVIATED]
+
+  [[codeql::autosar_deviation(
+      "a-0-4-2-deviation")]] long double dd4; // COMPLIANT[DEVIATED]
+
+  [[codeql::autosar_deviation("a-0-4-2-deviation")]] {
+    long double d7; // COMPLIANT[DEVIATED]
+    getZ();         // NON_COMPLIANT (A0-1-2)
+    long double d8; // COMPLIANT[DEVIATED]
+    getZ();         // NON_COMPLIANT (A0-1-2)
+    long double d9; // COMPLIANT[DEVIATED]
+  }
+  long double d10; // NON_COMPLIANT (A0-4-2)
+  [[codeql::autosar_deviation("a-0-4-2-deviation")]] {
+    long double d11; // COMPLIANT[DEVIATED]
+    getZ();          // NON_COMPLIANT (A0-1-2)
+    long double d12; // COMPLIANT[DEVIATED]
+    getZ();          // NON_COMPLIANT (A0-1-2)
+    long double d13; // COMPLIANT[DEVIATED]
+  }
+  long double d14; // NON_COMPLIANT (A0-4-2)
+  getZ();          // NON_COMPLIANT (A0-1-2)
+  [[codeql::autosar_deviation("a-0-4-2-deviation")]] for (long double d15 = 0.0;
+                                                          true;) {
+  }                                    // COMPLIANT[DEVIATED]
+  for (long double d16 = 0.0; true;) { // NON_COMPLIANT (A0-4-2)
+  }
+  return 0;
+}
+
+[[codeql::autosar_deviation("a-0-4-2-deviation")]] int
+test_function_deviation() {
+  int x = 0;       // COMPLIANT[DEVIATED]
+  getZ();          // NON_COMPLIANT
+  long double dd1; // COMPLIANT[DEVIATED]
+}
+
+[[codeql::autosar_deviation("a-0-4-2-deviation")]] void test_lambdas() {
+  auto l = []() {
+    long double d4; // COMPLIANT[DEVIATED]
+    getZ();         // NON_COMPLIANT
+  };
+}
+
+// Attributes are not supported on a class level at the moment
+[[codeql::autosar_deviation("a-0-4-2-deviation")]] class ClassA {
+  long double d1; // COMPLIANT[DEVIATED - false positive]
+  class ClassNested {
+    long double d2; // COMPLIANT[DEVIATED - false positive]
+  };
+  void test() {
+    long double d3; // COMPLIANT[DEVIATED - false positive]
+    getZ();         // NON_COMPLIANT
+  }
+};
+
+// static_assert, templates, noexcept, multiple declarations
+
+// Namespaces not currently supported by attributes
+// [[codeql::autosar_deviation("a-0-4-2-deviation")]] namespace NS {
+// long double d1; // COMPLIANT[DEVIATED]
+// class ClassA {
+//   long double d1; // COMPLIANT[DEVIATED]
+// };
+// void test() {
+//   long double d1; // COMPLIANT[DEVIATED]
+// }
+// }
\ No newline at end of file
diff --git a/cpp/common/test/deviations/deviations_basic_test/main.cpp b/cpp/common/test/deviations/deviations_basic_test/main.cpp
index 0b302ea1f2..aa389ed0ad 100644
--- a/cpp/common/test/deviations/deviations_basic_test/main.cpp
+++ b/cpp/common/test/deviations/deviations_basic_test/main.cpp
@@ -12,5 +12,30 @@ int main(int argc, char **argv) {
   getX();         // NON_COMPLIANT
   long double d1; // NON_COMPLIANT (A0-4-2)
   long double d2; // a-0-4-2-deviation COMPLIANT[DEVIATED]
+
+  long double d3; // codeql::autosar_deviation(a-0-4-2-deviation)
+                  // COMPLIANT[DEVIATED]
+  long double d4; // NON_COMPLIANT (A0-4-2)
+  // codeql::autosar_deviation_next_line(a-0-4-2-deviation)
+  long double d5; // COMPLIANT[DEVIATED]
+  long double d6; // NON_COMPLIANT (A0-4-2)
+
+  // codeql::autosar_deviation_begin(a-0-4-2-deviation)
+  long double d7; // COMPLIANT[DEVIATED]
+  getX();         // NON_COMPLIANT (A0-1-2)
+  long double d8; // COMPLIANT[DEVIATED]
+  getX();         // NON_COMPLIANT (A0-1-2)
+  long double d9; // COMPLIANT[DEVIATED]
+  // codeql::autosar_deviation_end(a-0-4-2-deviation)
+  long double d10; // NON_COMPLIANT (A0-4-2)
+  // codeql::autosar_deviation_begin(a-0-4-2-deviation)
+  long double d11; // COMPLIANT[DEVIATED]
+  getX();          // NON_COMPLIANT (A0-1-2)
+  long double d12; // COMPLIANT[DEVIATED]
+  getX();          // NON_COMPLIANT (A0-1-2)
+  long double d13; // COMPLIANT[DEVIATED]
+  // codeql::autosar_deviation_end(a-0-4-2-deviation)
+  long double d14; // NON_COMPLIANT (A0-4-2)
+  getX();          // NON_COMPLIANT (A0-1-2)
   return 0;
 }
\ No newline at end of file
diff --git a/cpp/common/test/deviations/deviations_report_deviated/DeviationsSuppression.expected b/cpp/common/test/deviations/deviations_report_deviated/DeviationsSuppression.expected
deleted file mode 100644
index 50ceb35b9d..0000000000
--- a/cpp/common/test/deviations/deviations_report_deviated/DeviationsSuppression.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-| file://:0:0:0:0 | (no string representation) | // lgtm[cpp/autosar/type-long-double-used] | lgtm[cpp/autosar/type-long-double-used] | main.cpp:12:1:12:58 | Deviation of cpp/autosar/type-long-double-used for comment // a-0-4-2-deviation COMPLIANT[DEVIATED]. |
-| file://:0:0:0:0 | (no string representation) | // lgtm[cpp/autosar/unused-return-value] | lgtm[cpp/autosar/unused-return-value] | nested/nested2/test2.h:1:1:6:1 | Deviation of cpp/autosar/unused-return-value for nested/nested2/test2.h. |
-| file://:0:0:0:0 | (no string representation) | // lgtm[cpp/autosar/useless-assignment] | lgtm[cpp/autosar/useless-assignment] | coding-standards.xml:1:1:17:19 | Deviation of cpp/autosar/useless-assignment for coding-standards.xml. |
-| file://:0:0:0:0 | (no string representation) | // lgtm[cpp/autosar/useless-assignment] | lgtm[cpp/autosar/useless-assignment] | main.cpp:1:1:14:1 | Deviation of cpp/autosar/useless-assignment for main.cpp. |
-| file://:0:0:0:0 | (no string representation) | // lgtm[cpp/autosar/useless-assignment] | lgtm[cpp/autosar/useless-assignment] | nested/coding-standards.xml:1:1:13:19 | Deviation of cpp/autosar/useless-assignment for nested/coding-standards.xml. |
-| file://:0:0:0:0 | (no string representation) | // lgtm[cpp/autosar/useless-assignment] | lgtm[cpp/autosar/useless-assignment] | nested/nested2/test2.h:1:1:6:1 | Deviation of cpp/autosar/useless-assignment for nested/nested2/test2.h. |
-| file://:0:0:0:0 | (no string representation) | // lgtm[cpp/autosar/useless-assignment] | lgtm[cpp/autosar/useless-assignment] | nested/test.h:1:1:6:1 | Deviation of cpp/autosar/useless-assignment for nested/test.h. |
diff --git a/cpp/common/test/deviations/deviations_report_deviated/DeviationsSuppression.qlref b/cpp/common/test/deviations/deviations_report_deviated/DeviationsSuppression.qlref
deleted file mode 100644
index 6268ee7342..0000000000
--- a/cpp/common/test/deviations/deviations_report_deviated/DeviationsSuppression.qlref
+++ /dev/null
@@ -1 +0,0 @@
-codingstandards/cpp/deviations/DeviationsSuppression.ql
\ No newline at end of file
diff --git a/cpp/common/test/deviations/invalid_deviations/InvalidDeviationCodeIdentifier.expected b/cpp/common/test/deviations/invalid_deviations/InvalidDeviationCodeIdentifier.expected
new file mode 100644
index 0000000000..1d7153bafd
--- /dev/null
+++ b/cpp/common/test/deviations/invalid_deviations/InvalidDeviationCodeIdentifier.expected
@@ -0,0 +1,13 @@
+| invalidcodeidentifiers.cpp:1:1:1:45 | // codeql::misra_deviation(x) - invalid, no x | Deviation marker does not match an expected format, or references an unknown code identifier. |
+| invalidcodeidentifiers.cpp:2:1:2:47 | // codeql::autosar_deviation(x) - invalid, no x | Deviation marker does not match an expected format, or references an unknown code identifier. |
+| invalidcodeidentifiers.cpp:3:1:3:44 | // codeql::cert_deviation(x) - invalid, no x | Deviation marker does not match an expected format, or references an unknown code identifier. |
+| invalidcodeidentifiers.cpp:4:1:4:71 | // codeql::misra_deviation_next(a-0-4-2-deviation) - invalid, next_line | Deviation marker does not match an expected format, or references an unknown code identifier. |
+| invalidcodeidentifiers.cpp:5:1:5:73 | // codeql::autosar_deviation_next(a-0-4-2-deviation) - invalid, next_line | Deviation marker does not match an expected format, or references an unknown code identifier. |
+| invalidcodeidentifiers.cpp:6:1:6:70 | // codeql::cert_deviation_next(a-0-4-2-deviation) - invalid, next_line | Deviation marker does not match an expected format, or references an unknown code identifier. |
+| invalidcodeidentifiers.cpp:14:1:14:74 | // codeql::misra_deviation_end(a-0-4-2-deviation) - invalid, unmatched end | Deviation end block is unmatched. |
+| invalidcodeidentifiers.cpp:15:1:15:76 | // codeql::autosar_deviation_end(a-0-4-2-deviation) - invalid, unmatched end | Deviation end block is unmatched. |
+| invalidcodeidentifiers.cpp:16:1:16:73 | // codeql::cert_deviation_end(a-0-4-2-deviation) - invalid, unmatched end | Deviation end block is unmatched. |
+| invalidcodeidentifiers.cpp:17:1:17:78 | // codeql::misra_deviation_begin(a-0-4-2-deviation) - invalid, unmatched begin | Deviation start block is unmatched. |
+| invalidcodeidentifiers.cpp:18:1:18:80 | // codeql::autosar_deviation_begin(a-0-4-2-deviation) - invalid, unmatched begin | Deviation start block is unmatched. |
+| invalidcodeidentifiers.cpp:19:1:19:77 | // codeql::cert_deviation_begin(a-0-4-2-deviation) - invalid, unmatched begin | Deviation start block is unmatched. |
+| invalidcodeidentifiers.cpp:21:3:21:25 | misra_deviation | Deviation attribute references unknown code identifier x. |
diff --git a/cpp/common/test/deviations/invalid_deviations/InvalidDeviationCodeIdentifier.qlref b/cpp/common/test/deviations/invalid_deviations/InvalidDeviationCodeIdentifier.qlref
new file mode 100644
index 0000000000..c70989966f
--- /dev/null
+++ b/cpp/common/test/deviations/invalid_deviations/InvalidDeviationCodeIdentifier.qlref
@@ -0,0 +1 @@
+codingstandards/cpp/deviations/InvalidDeviationCodeIdentifier.ql
\ No newline at end of file
diff --git a/cpp/common/test/deviations/invalid_deviations/InvalidDeviationPermits.expected b/cpp/common/test/deviations/invalid_deviations/InvalidDeviationPermits.expected
index 609d517c05..4378fdf11d 100644
--- a/cpp/common/test/deviations/invalid_deviations/InvalidDeviationPermits.expected
+++ b/cpp/common/test/deviations/invalid_deviations/InvalidDeviationPermits.expected
@@ -1,2 +1,2 @@
-| coding-standards.xml:100:7:103:33 | deviation-permits-entry | coding-standards.xml: Deviation permit does not specify a permit identifier. |
-| coding-standards.xml:104:7:107:33 | deviation-permits-entry | coding-standards.xml: Deviation permit specifies unknown property `invalid-property`. |
+| coding-standards.xml:105:7:108:33 | deviation-permits-entry | coding-standards.xml: Deviation permit does not specify a permit identifier. |
+| coding-standards.xml:109:7:112:33 | deviation-permits-entry | coding-standards.xml: Deviation permit specifies unknown property `invalid-property`. |
diff --git a/cpp/common/test/deviations/invalid_deviations/coding-standards.xml b/cpp/common/test/deviations/invalid_deviations/coding-standards.xml
index 36dedead00..ff0d69eaec 100644
--- a/cpp/common/test/deviations/invalid_deviations/coding-standards.xml
+++ b/cpp/common/test/deviations/invalid_deviations/coding-standards.xml
@@ -86,6 +86,11 @@
          <rule-id>RULE-9-1</rule-id>
          <query-id>c/misra/object-with-auto-storage-duration-read-before-init</query-id>
       </deviations-entry>
+      <deviations-entry>
+         <rule-id>A0-4-2</rule-id>
+         <justification>long double is required for interaction with third-party libraries.</justification>
+         <code-identifier>a-0-4-2-deviation</code-identifier>
+      </deviations-entry>
    </deviations>
    <deviation-permits>
       <deviation-permits-entry>
diff --git a/cpp/common/test/deviations/invalid_deviations/coding-standards.yml b/cpp/common/test/deviations/invalid_deviations/coding-standards.yml
index 1ce8cc718a..ceea31c460 100644
--- a/cpp/common/test/deviations/invalid_deviations/coding-standards.yml
+++ b/cpp/common/test/deviations/invalid_deviations/coding-standards.yml
@@ -46,6 +46,9 @@ deviations:
   - permit-id: DP2
   - rule-id: RULE-9-1
     query-id: c/misra/object-with-auto-storage-duration-read-before-init
+  - rule-id: A0-4-2
+    justification: long double is required for interaction with third-party libraries.
+    code-identifier: a-0-4-2-deviation
 deviation-permits:
   - permit-id: DP1
     justification: foo bar baz
diff --git a/cpp/common/test/deviations/invalid_deviations/dummy.cpp b/cpp/common/test/deviations/invalid_deviations/dummy.cpp
deleted file mode 100644
index 4a3cb36e40..0000000000
--- a/cpp/common/test/deviations/invalid_deviations/dummy.cpp
+++ /dev/null
@@ -1 +0,0 @@
-// Deliberately blank
\ No newline at end of file
diff --git a/cpp/common/test/deviations/invalid_deviations/invalidcodeidentifiers.cpp b/cpp/common/test/deviations/invalid_deviations/invalidcodeidentifiers.cpp
new file mode 100644
index 0000000000..a4da098dcb
--- /dev/null
+++ b/cpp/common/test/deviations/invalid_deviations/invalidcodeidentifiers.cpp
@@ -0,0 +1,24 @@
+// codeql::misra_deviation(x) - invalid, no x
+// codeql::autosar_deviation(x) - invalid, no x
+// codeql::cert_deviation(x) - invalid, no x
+// codeql::misra_deviation_next(a-0-4-2-deviation) - invalid, next_line
+// codeql::autosar_deviation_next(a-0-4-2-deviation) - invalid, next_line
+// codeql::cert_deviation_next(a-0-4-2-deviation) - invalid, next_line
+
+// codeql::misra_deviation_begin(a-0-4-2-deviation)
+// codeql::autosar_deviation_begin(a-0-4-2-deviation)
+// codeql::cert_deviation_begin(a-0-4-2-deviation)
+// codeql::misra_deviation_end(a-0-4-2-deviation)
+// codeql::autosar_deviation_end(a-0-4-2-deviation)
+// codeql::cert_deviation_end(a-0-4-2-deviation)
+// codeql::misra_deviation_end(a-0-4-2-deviation) - invalid, unmatched end
+// codeql::autosar_deviation_end(a-0-4-2-deviation) - invalid, unmatched end
+// codeql::cert_deviation_end(a-0-4-2-deviation) - invalid, unmatched end
+// codeql::misra_deviation_begin(a-0-4-2-deviation) - invalid, unmatched begin
+// codeql::autosar_deviation_begin(a-0-4-2-deviation) - invalid, unmatched begin
+// codeql::cert_deviation_begin(a-0-4-2-deviation) - invalid, unmatched begin
+
+[[codeql::misra_deviation("x")]] // invalid
+void test() {}
+
+[[codeql::autosar_deviation("a-0-4-2-deviation")]] void test2() {}
diff --git a/docs/user_manual.md b/docs/user_manual.md
index df3ce9a6b8..a04ba0814e 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -31,6 +31,7 @@
 | 0.23.0  | 2024-10-21 | Luke Cartey     | Add assembly as a hazard.                                                                                               |
 | 0.24.0  | 2024-10-22 | Luke Cartey     | Add CodeQL packs as a usable output, update release artifacts list.                                                     |
 | 0.25.0  | 2025-01-15 | Mike Fairhurst  | Add guidance for the usage of 'strict' queries.                                                                         |
+| 0.26.0  | 2025-02-12 | Luke Cartey     | Describe support for new deviation code identifier formats                                                               |
 
 ## Release information
 
@@ -415,7 +416,7 @@ The example describes three ways of scoping a deviation:
 
 1. The deviation for `A18-1-1` applies to any source file in the same or a child directory of the directory containing the example `coding-standards.yml`.
 2. The deviation for `A18-5-1` applies to any source file in the directory `foo/bar` or a child directory of `foo/bar` relative to the directory containing the `coding-standards.yml`.
-3. The deviation for `A0-4-2` applies to any source element that has a comment residing on **the same line** containing the identifier specified in `code-identifier`.
+3. The deviation for `A0-4-2` applies to any source element that marked by a comment containing the identifier specified in `code-identifier`. The different acceptable formats are discussed in the next section.
 
 The activation of the deviation mechanism requires an extra step in the database creation process.
 This extra step is the invocation of the Python script `path/to/codeql-coding-standards/scripts/configuration/process_coding_standards_config.py` that is part of the coding standards code scanning pack.
@@ -430,7 +431,90 @@ The `process_coding_standards_config.py` has a dependency on the package `pyyaml
 
 `pip3 install -r path/to/codeql-coding-standards/scripts/configuration/requirements.txt`
 
-##### Deviation permit
+##### Deviation code identifier attributes
+
+A code identifier specified in a deviation record can be applied to certain results in the code by adding a C or C++ attribute of the following format:
+
+```
+[[codeql::<standard>_deviation("code-identifier")]]
+```
+
+For example `[[codeql::autosar_deviation("a1-2-4")]]` would apply a deviation of a rule in the AUTOSAR standard, using the code identifier `a1-2-4`. The supported standard names are `misra`, `autosar` and `cert`.
+
+This attribute may be added to the following program elements:
+
+ * Functions
+ * Statements
+ * Variables
+
+Deviation attributes are inherited from parents in the code structure. For example, a deviation attribute applied to a function will apply the deviation to all code within the function.
+
+Multiple code identifiers may be passed in a single attribute to apply multiple deviations, for example:
+
+```
+[[codeql::misra_deviation("code-identifier-1", "code-identifier-2")]]
+```
+
+Note - considation should be taken to ensure the use of custom attributes for deviations is compatible with your chosen language version, compiler, compiler configuration and coding standard.
+
+**Use of attributes in C Coding Standards**: The C Standard introduces attributes in C23, however some compilers support attributes as a language extension in prior versions. You should:
+ * Confirm that your compiler supports attributes for your chosen compiler configuration, if necessary as a language extension.
+ * Confirm that unknown attributes are ignored by the compiler.
+ * For MISRA C, add a project deviation against "Rule 1.2: Language extensions should not be used", if attribute support is a language extension in your language version. 
+
+**Use of attributes in C++ Coding Standards**: The C++ Standard supports attributes in C++14, however the handling of unknown attributes is implementation defined. From C++17 onwards, unknown attributes are mandated to be ignored. Unknown attributes will usually raise an "unknown attribute" warning. You should:
+ * If using C++14, confirm that your compiler ignores unknown attributes.
+ * If using AUTOSAR and a compiler which produces warnings on unknown attributes, the compiler warning should be disabled (as per `A1-1-2: A warning level of the compilation process shall be set in compliance with project policies`),  to ensure compliance with `A1-4-3: All code should compiler free of compiler warnings`.
+
+If you cannot satisfy these condition, please use the deviation code identifier comment format instead.
+
+##### Deviation code identifier comments
+
+As an alternative to attributes, a code identifier specified in a deviation record can be applied to certain results in the code by adding a comment marker consisting of a `code-identifier` with some optional annotations. The supported marker annotation formats are:
+
+ - `<code-identifier>` - the deviation applies to results on the current line.
+ - `codeql::<standard>_deviation(<code-identifier>)` - the deviation applies to results on the current line.
+ - `codeql::<standard>_deviation_next_line(<code-identifier>)` - this deviation applies to results on the next line.
+ - `codeql::<standard>_deviation_begin(<code-identifier>)` - marks the beginning of a range of lines where the deviation applies.
+ - `codeql::<standard>_deviation_end(<code-identifier>)` - marks the end of a range of lines where the deviation applies.
+
+Here are some examples, using the deviation record with the `a-0-4-2-deviation` code-identifier specified above:
+```cpp
+  long double x1; // NON_COMPLIANT
+
+  long double x2; // a-0-4-2-deviation - COMPLIANT
+  long double x3; // COMPLIANT - a-0-4-2-deviation
+
+  long double x4; // codeql::autosar_deviation(a-0-4-2-deviation) - COMPLIANT
+  long double x5; // COMPLIANT - codeql::autosar_deviation(a-0-4-2-deviation)
+
+  // codeql::autosar_deviation_next_line(a-0-4-2-deviation)
+  long double x6; // COMPLIANT
+
+  // codeql::autosar_deviation_begin(a-0-4-2-deviation)
+  long double x7; // COMPLIANT
+  // codeql::autosar_deviation_end(a-0-4-2-deviation)
+```
+
+`codeql::<standard>_deviation_end` markers will pair with the closest unmatched `codeql::<standard>_deviation_begin` for the same `code-identifier`. Consider this example:
+```cpp
+1 | // codeql::autosar_deviation_begin(a-0-4-2-deviation)
+2 |
+3 | // codeql::autosar_deviation_begin(a-0-4-2-deviation)
+4 |
+5 | // codeql::autosar_deviation_end(a-0-4-2-deviation)
+6 |
+7 | // codeql::autosar_deviation_end(a-0-4-2-deviation)
+```
+Here, Line 1 will pair with Line 7, and Line 3 will pair with Line 5.
+
+A `codeql::<standard>_deviation_end` without a matching `codeql::<standard>_deviation_begin`, or `codeql::<standard>_deviation_begin` without a matching `codeql::<standard>_deviation_end` is invalid and will be ignored.
+
+`codeql::<standard>_deviation_begin` and `ccodeql::<standard>_deviation_end` markers only apply within a single file. Markers cannot be paired across files, and deviations do not apply to included files.
+
+Note: deviation comment markers cannot be applied to the body of a macro. Please apply the deviation to macro expansion, or use the attribute deviation format.
+
+##### Deviation permits
 
 The current implementation supports _deviation permits_ as described in the [MISRA Compliance:2020](https://www.misra.org.uk/app/uploads/2021/06/MISRA-Compliance-2020.pdf) section _4.3 Deviation permits_.