From a23743d5879320fe895703292feeae664293dcd4 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 29 Oct 2025 06:43:06 -0700
Subject: [PATCH 01/10] Add "Baseline" query suites for C/C++.

These are queries from MISRA, AUTOSAR, and CERT, that have been hand picked
based on a few properties:
- review of violation count for each rule on real projects
- review of accuracy of each rule
- subjective review of broad applicability across most projects
- subjective review of severity of each rule

The baseline rules have been divided into two categories, "style," and "safety."
The choice of which is subjective, but as a general rule:
- Rules that tend to report only erroneous cases are typically "safety."
- Rules that tend to report patterns that obscure erroneous behavior are
  typically "style."
- If alerts can be mitigated by simple changes, it's more likely "style."
- If it is challenging for a human to spot the rule violation, it's more likely
  "safety."
- If the rule is designed to enforce some kind of "good habits," not just fix an
  isolated it's more likely "style."
- If the rule feels "opinionated" in some sense, it's more likely "style."
- If it is difficult to decide whether a finding should be fixed or deviated,
  it is more likely "safety."
- Unsurprisingly, if the rule is purely syntactic or related to naming, it's
  more likely "style."

Some rules are in both suites -- for instance, rules that ban the use of 'goto'
are conceivably both "style" and "safety." While goto is not erroneous in
itself, and gotos are easy to spot during human review, it is typically not a
simple task to refactor code to remove gotos, and it is difficult to decide when
a goto serves a legitimate purpose and the rule should be deviated.

In general, the 'style' suites have more violations which are easier to fix, and
the 'safety' suites have fewer violation that are harder to fix but warrant more
attention to address. Project authors can therefore enable both with the
'default' suite, or pick between the two kinds suitable for their project and
goals.
---
 .codeqlmanifest.json                          |  2 ++
 c/baseline_suites/codeql-pack.lock.yml        | 24 +++++++++++++++++++
 .../codeql-suites/c-baseline-default.qls      | 10 ++++++++
 .../codeql-suites/c-baseline-safety.qls       |  8 +++++++
 .../codeql-suites/c-baseline-style.qls        |  8 +++++++
 c/baseline_suites/qlpack.yml                  |  9 +++++++
 .../VariableLengthArraySizeNotInValidRange.ql |  1 +
 ...atePointersThatDoNotReferToTheSameArray.ql |  1 +
 .../CON30-C/CleanUpThreadSpecificStorage.ql   |  1 +
 ...NotAllowAMutexToGoOutOfScopeWhileLocked.ql |  1 +
 .../DoNotDestroyAMutexWhileItIsLocked.ql      |  1 +
 .../PreventDataRacesWithMultipleThreads.ql    |  1 +
 ...RaceConditionsWhenUsingLibraryFunctions.ql |  1 +
 ...pFunctionsThatCanSpuriouslyWakeUpInLoop.ql |  1 +
 ...eserveSafetyWhenUsingConditionVariables.ql |  1 +
 .../ThreadWasPreviouslyJoinedOrDetached.ql    |  1 +
 .../AtomicVariableTwiceInExpression.ql        |  1 +
 ...rapFunctionsThatCanFailSpuriouslyInLoop.ql |  1 +
 ...propriateStorageDurationsFunctionReturn.ql |  1 +
 .../DCL38-C/DeclaringAFlexibleArrayMember.ql  |  1 +
 .../DCL41-C/VariablesInsideSwitchStatement.ql |  1 +
 ...tModifyTheReturnValueOfCertainFunctions.ql |  1 +
 ...vPointerIsInvalidAfterCertainOperations.ql |  1 +
 .../ENV32-C/ExitHandlersMustReturnNormally.ql |  1 +
 ...oNotStorePointersReturnedByEnvFunctions.ql |  1 +
 ...orePointersReturnedByEnvironmentFunWarn.ql |  1 +
 .../rules/ERR30-C/ErrnoReadBeforeReturn.ql    |  1 +
 .../rules/ERR30-C/SetlocaleMightSetErrno.ql   |  1 +
 .../DoNotRelyOnIndeterminateValuesOfErrno.ql  |  1 +
 ...sVolatileObjectWithNonVolatileReference.ql |  1 +
 ...DoNotModifyObjectsWithTemporaryLifetime.ql |  1 +
 ...CallFunctionPointerWithIncompatibleType.ql |  1 +
 ...tCallFunctionsWithIncompatibleArguments.ql |  1 +
 .../EXP40-C/DoNotModifyConstantObjects.ql     |  1 +
 ...sAliasedPointerToRestrictQualifiedParam.ql |  1 +
 ...trictPointerReferencesOverlappingObject.ql |  1 +
 ...ABitwiseOperatorWithABooleanLikeOperand.ql |  1 +
 .../ExcludeUserInputFromFormatStrings.ql      |  1 +
 ...sfulFgetsOrFgetwsMayReturnAnEmptyString.ql |  1 +
 .../src/rules/FIO38-C/DoNotCopyAFileObject.ql |  1 +
 ...ernatelyIOFromAStreamWithoutPositioning.ql |  1 +
 .../ResetStringsOnFgetsOrFgetwsFailure.ql     |  1 +
 .../DoNotCallGetcAndPutcWithSideEffects.ql    |  1 +
 ...ToctouRaceConditionsWhileAccessingFiles.ql |  1 +
 .../UndefinedBehaviorAccessingAClosedFile.ql  |  1 +
 .../src/rules/FIO47-C/UseValidSpecifiers.ql   |  1 +
 .../FLP30-C/FloatingPointLoopCounters.ql      |  1 +
 .../FLP37-C/MemcmpUsedToCompareFloats.ql      |  1 +
 .../INT35-C/UseCorrectIntegerPrecisions.ql    |  1 +
 .../rules/MEM30-C/DoNotAccessFreedMemory.ql   |  1 +
 ...uctsWithAFlexibleArrayMemberDynamically.ql |  1 +
 ...uctsWithAFlexibleArrayMemberDynamically.ql |  1 +
 ...DoNotModifyAlignmentOfMemoryWithRealloc.ql |  1 +
 ...andUsedForGeneratingPseudorandomNumbers.ql |  1 +
 ...roperlySeedPseudorandomNumberGenerators.ql |  1 +
 ...oNotPassInvalidDataToTheAsctimeFunction.ql |  1 +
 ...ArgOnAVaListThatHasAnIndeterminateValue.ql |  1 +
 .../DoNotViolateInLineLinkageConstraints.ql   |  1 +
 .../SideEffectsInArgumentsToUnsafeMacros.ql   |  1 +
 .../MacroOrFunctionArgsContainHashToken.ql    |  1 +
 ...yAsyncSafeFunctionsWithinSignalHandlers.ql |  1 +
 ...llSignalFromInterruptibleSignalHandlers.ql |  1 +
 ...eturnFromAComputationalExceptionHandler.ql |  1 +
 .../DoNotAttemptToModifyStringLiterals.ql     |  1 +
 ...sHasSufficientSpaceForTheNullTerminator.ql |  1 +
 ...erHandlingFunctionsRepresentableAsUChar.ql |  1 +
 .../DoNotConfuseNarrowAndWideFunctions.ql     |  1 +
 .../PrecautionIncludeGuardsNotProvided.ql     |  1 +
 .../SectionsOfCodeShallNotBeCommentedOut.ql   |  1 +
 ...dentifiersInTheSameNameSpaceUnambiguous.ql |  1 +
 .../DIR-4-9/FunctionOverFunctionLikeMacro.ql  |  1 +
 .../DIR-5-2/NotNoDeadlocksBetweenThreads.ql   |  1 +
 .../RULE-1-5/CallToObsolescentFunctionGets.ql |  1 +
 ...FunctionTypesNotInPrototypeFormObsolete.ql |  1 +
 .../InvalidDefineOrUndefOfStdBoolMacro.ql     |  1 +
 ...taticSpecifierFuncRedeclarationObsolete.ql |  1 +
 ...ticSpecifierObjectRedeclarationObsolete.ql |  1 +
 .../rules/RULE-1-5/SizeInReallocCallIsZero.ql |  1 +
 .../UseOfObsoleteMacroAtomicVarInit.ql        |  1 +
 .../AtomicQualifierAppliedToVoid.ql           |  1 +
 ...etweenIncompleteTypePointerAndOtherType.ql |  1 +
 ...nPointerToObjectAndNonIntArithmeticType.ql |  1 +
 ...NullNotUsedAsIntegerNullPointerConstant.ql |  1 +
 .../RULE-12-3/CommaOperatorShouldNotBeUsed.ql |  1 +
 ...antUnsignedIntegerExpressionsWrapAround.ql |  1 +
 .../SizeofOperatorUsedOnArrayTypeParam.ql     |  1 +
 .../AtomicAggregateObjectDirectlyAccessed.ql  |  1 +
 ...alizerListsContainPersistentSideEffects.ql |  1 +
 .../rules/RULE-13-2/UnsequencedAtomicReads.ql |  1 +
 .../rules/RULE-13-2/UnsequencedSideEffects.ql |  1 +
 ...ltOfAnAssignmentOperatorShouldNotBeUsed.ql |  1 +
 .../RULE-13-6/SizeofOperandWithSideEffect.ql  |  1 +
 .../RULE-14-1/LoopOverEssentiallyFloatType.ql |  1 +
 .../RULE-14-3/ControllingExprInvariant.ql     |  1 +
 .../src/rules/RULE-15-1/GotoStatementUsed.ql  |  1 +
 .../RULE-15-2/GotoLabelLocationCondition.ql   |  2 ++
 .../RULE-15-3/GotoLabelBlockCondition.ql      |  1 +
 .../rules/RULE-15-6/LoopCompoundCondition.ql  |  1 +
 .../RULE-15-6/SelectionCompoundCondition.ql   |  3 ++-
 .../RULE-15-6/SwitchCompoundCondition.ql      |  1 +
 .../RULE-16-1/SwitchCaseStartCondition.ql     |  1 +
 .../RULE-16-1/SwitchStmtNotWellFormed.ql      |  1 +
 .../NestSwitchLabelInSwitchStatement.ql       |  1 +
 .../DefaultNotFirstOrLastOfSwitch.ql          |  1 +
 .../RULE-16-6/SwitchClauseNumberCondition.ql  |  1 +
 ...onWithNoReturningBranchShouldBeNoreturn.ql |  1 +
 .../RULE-17-3/FunctionDeclaredImplicitly.ql   |  1 +
 .../NonVoidFunctionReturnCondition.ql         |  2 ++
 .../ArrayFunctionArgumentNumberOfElements.ql  |  3 ++-
 .../src/rules/RULE-17-6/UseOfArrayStatic.ql   |  1 +
 .../ReturnStatementInNoreturnFunction.ql      |  1 +
 ...ointersToVariablyModifiedArrayTypesUsed.ql |  1 +
 ...TwoLevelsOfPointerNestingInDeclarations.ql |  1 +
 ...StorageObjectAddressCopiedToOtherObject.ql |  1 +
 ...dLocalObjectAddressCopiedToGlobalObject.ql |  1 +
 .../RULE-18-7/FlexibleArrayMembersDeclared.ql |  2 ++
 .../RULE-18-8/VariableLengthArrayTypesUsed.ql |  2 ++
 ...rayToPointerConversionOfTemporaryObject.ql |  1 +
 ...eLValueSubscriptedWithTemporaryLifetime.ql |  1 +
 .../ObjectAssignedToAnOverlappingObject.ql    |  1 +
 .../ObjectCopiedToAnOverlappingObject.ql      |  1 +
 c/misra/src/rules/RULE-2-1/UnreachableCode.ql |  1 +
 c/misra/src/rules/RULE-2-2/DeadCode.ql        |  1 +
 .../rules/RULE-2-3/UnusedTypeDeclarations.ql  |  1 +
 .../rules/RULE-2-5/UnusedMacroDeclaration.ql  |  1 +
 .../rules/RULE-2-6/UnusedLabelDeclaration.ql  |  1 +
 .../rules/RULE-2-8/UnusedObjectDefinition.ql  |  1 +
 ...irectivesPrecededByDirectivesOrComments.ql |  1 +
 ...oreThanOneHashOperatorInMacroDefinition.ql |  1 +
 .../ForbiddenCharactersInHeaderFileName.ql    |  1 +
 .../MacroDefinedWithTheSameNameAsKeyword.ql   |  1 +
 .../rules/RULE-20-5/UndefShouldNotBeUsed.ql   |  1 +
 ...tionLikeMacroArgsContainHashTokenCQuery.ql |  1 +
 ...IdentifiersUsedInPreprocessorExpression.ql |  1 +
 .../CtypeFunctionArgNotUnsignedCharOrEof.ql   |  1 +
 ...emcmpUsedToCompareNullTerminatedStrings.ql |  1 +
 ...veMemcmpArgNotPointersToCompatibleTypes.ql |  1 +
 ...tringFunctionPointerArgumentOutOfBounds.ql |  1 +
 .../StringLibrarySizeArgumentOutOfBounds.ql   |  1 +
 ...ReturnedByLocaleSettingUsedAsPtrToConst.ql |  1 +
 .../CallToSetlocaleInvalidatesOldPointers.ql  |  1 +
 ...llToSetlocaleInvalidatesOldPointersWarn.ql |  1 +
 ...gMathArgumentsWithDifferingStandardType.ql |  1 +
 .../RULE-21-24/CallToBannedRandomFunction.ql  |  1 +
 .../TimedlockOnInappropriateMutexType.ql      |  1 +
 .../StandardHeaderFileUsedSetjmph.ql          |  1 +
 .../AtofAtoiAtolAndAtollOfStdlibhUsed.ql      |  1 +
 .../CloseFileHandleWhenNoLongerNeededMisra.ql |  1 +
 .../FreeMemoryWhenNoLongerNeededMisra.ql      |  1 +
 ...TestErrnoRightAfterErrnoSettingFunction.ql |  1 +
 .../ThreadPreviouslyJoinedOrDetached.ql       |  1 +
 .../MutexInitWithInvalidMutexType.ql          |  1 +
 .../MutexObjectsNotAlwaysUnlocked.ql          |  1 +
 .../InvalidOperationOnUnlockedMutex.ql        |  1 +
 ...onditionVariableUsedWithMultipleMutexes.ql |  1 +
 ...OnlyFreeMemoryAllocatedDynamicallyMisra.ql |  1 +
 .../ThreadStorageNotInitializedBeforeUse.ql   |  1 +
 ...leOpenForReadAndWriteOnDifferentStreams.ql |  1 +
 .../AttemptToWriteToAReadOnlyStream.ql        |  1 +
 .../PointerToAFileObjectDereferenced.ql       |  1 +
 .../rules/RULE-22-6/FileUsedAfterClosed.ql    |  1 +
 ...allBeComparedWithUnmodifiedReturnValues.ql |  1 +
 .../RULE-22-8/ErrnoSetToZeroPriorToCall.ql    |  1 +
 .../RULE-22-9/ErrnoSetToZeroAfterCall.ql      |  1 +
 ...ricSelectionDoesntDependOnMacroArgument.ql |  1 +
 .../GenericSelectionNotExpandedFromAMacro.ql  |  1 +
 ...ricSelectionNotFromMacroWithSideEffects.ql |  1 +
 .../GenericWithoutNonDefaultAssociation.ql    |  1 +
 .../GenericAssociationWithUnselectableType.ql |  1 +
 ...rousDefaultSelectionForPointerInGeneric.ql |  1 +
 .../InvalidGenericMacroArgumentEvaluation.ql  |  1 +
 .../DefaultGenericSelectionNotFirstOrLast.ql  |  1 +
 .../RULE-3-2/LineSplicingUsedInComments.ql    |  2 ++
 ...HexadecimalEscapeSequencesNotTerminated.ql |  1 +
 .../ExternalIdentifiersNotDistinct.ql         |  1 +
 ...ifiersDeclaredInTheSameScopeNotDistinct.ql |  1 +
 ...MacroIdentifierNotDistinctFromParameter.ql |  1 +
 .../SingleBitNamedBitFieldsOfASignedType.ql   |  1 +
 .../BitFieldDeclaredAsMemberOfAUnion.ql       |  1 +
 .../UseOfBannedSmallIntegerConstantMacro.ql   |  1 +
 .../rules/RULE-8-1/ExplicitlyDeclareTypes.ql  |  1 +
 .../InlineFunctionNotDeclaredStaticStorage.ql |  2 ++
 ...lueImplicitEnumerationConstantNotUnique.ql |  1 +
 .../RULE-8-14/RestrictTypeQualifierUsed.ql    |  1 +
 ...clarationOfObjectWithUnmatchedAlignment.ql |  1 +
 .../RedeclarationOfObjectWithoutAlignment.ql  |  2 ++
 .../rules/RULE-8-16/AlignmentWithSizeZero.ql  |  1 +
 ...eThanOneAlignmentSpecifierOnDeclaration.ql |  1 +
 .../FunctionTypesNotInPrototypeForm.ql        |  1 +
 ...ngStaticSpecifierFunctionRedeclarationC.ql |  2 ++
 ...singStaticSpecifierObjectRedeclarationC.ql |  2 ++
 ...ctWithAutoStorageDurationReadBeforeInit.ql |  1 +
 ...rForAggregateOrUnionNotEnclosedInBraces.ql |  1 +
 ...nitializedArrayWithExplicitInitializers.ql |  1 +
 ...dInitializationOfAggregateObjectElement.ql |  1 +
 .../RULE-9-7/UninitializedAtomicObject.ql     |  1 +
 .../src/rules/A0-1-1/UselessAssignment.ql     |  1 +
 .../CStandardLibraryHeadersAreDeprecated.ql   |  1 +
 ...vedFromMoreThanOneNonInterfaceBaseClass.ql |  1 +
 .../UserDefinedAssignmentOperatorVirtual.ql   |  1 +
 ...ructorWithFundamentalArgMissingExplicit.ql |  2 ++
 .../DestructorOfABaseClassNotPublicVirtual.ql |  1 +
 ...ClassDataMembersInitializationCondition.ql |  1 +
 .../MoveConstructorUsesCopySemantics.ql       |  1 +
 .../A13-2-1/AssignmentOperatorReturnThis.ql   |  2 ++
 ...edConversionOperatorsNotDefinedExplicit.ql |  2 ++
 ...positeOperatorsNotDefinedInTermsOfOther.ql |  1 +
 ...rectIntervalForDigitSequencesSeparators.ql |  1 +
 .../TemplateConstructorOverloadResolution.ql  |  1 +
 ...eSpecializationNotDeclaredInTheSameFile.ql |  1 +
 .../OnlyThrowStdExceptionDerivedTypes.ql      |  1 +
 .../rules/A15-1-2/PointerExceptionObject.ql   |  1 +
 ...structorErrorLeavesObjectInInvalidState.ql |  1 +
 .../A15-3-3/MissingCatchHandlerInMain.ql      |  1 +
 .../A15-3-4/CatchAllEllipsisUsedInNonMain.ql  |  1 +
 .../UseOfDynamicExceptionSpecification.ql     |  1 +
 .../IncompatibleNoexceptSpecification.ql      |  1 +
 ...tibleNoexceptSpecificationForOverriders.ql |  1 +
 .../InconsistentNoexceptFalseSpecification.ql |  1 +
 .../InconsistentNoexceptTrueSpecification.ql  |  1 +
 ...curInHeaderFileNameOrInIncludeDirective.ql |  2 ++
 .../src/rules/A16-6-1/ErrorDirectiveUsed.ql   |  1 +
 ...StringNumberConversionMissingErrorCheck.ql |  1 +
 .../UseOfUnsafeCStringToNumberConversion.ql   |  1 +
 .../A18-1-2/VectorboolSpecializationUsed.ql   |  1 +
 .../src/rules/A18-1-3/AutoPtrTypeUsed.ql      |  1 +
 ...AnElementOfAnArrayPassedToASmartPointer.ql |  1 +
 ...rNewAndOperatorDeleteNotDefinedGlobally.ql |  1 +
 ...orNewAndOperatorDeleteNotDefinedLocally.ql |  1 +
 .../rules/A18-5-3/NewArrayDeleteMismatch.ql   |  1 +
 .../rules/A18-5-3/NewDeleteArrayMismatch.ql   |  1 +
 .../A18-5-8/UnnecessaryUseOfDynamicStorage.ql |  1 +
 ...ThrowingNoThrowOperatorNewDeleteAutosar.ql |  1 +
 .../ThrowingOperatorNewReturnsNullAutosar.ql  |  1 +
 ...peratorNewThrowsInvalidExceptionAutosar.ql |  1 +
 cpp/autosar/src/rules/A18-9-1/BindUsed.ql     |  1 +
 .../ForwardingValuesToOtherFunctions.ql       |  1 +
 .../rules/A18-9-3/MoveUsedOnConstObjects.ql   |  1 +
 .../ArgumentToForwardSubsequentlyUsed.ql      |  1 +
 .../rules/A2-13-1/EscapeSequenceOutsideISO.ql |  1 +
 ...ngLiteralsAssignedToNonConstantPointers.ql |  1 +
 ...mesUsedOutsideCharacterOrStringLiterals.ql |  1 +
 .../A2-7-1/SingleLineCommentEndsWithSlash.ql  |  2 ++
 ...PtrNotUsedToRepresentExclusiveOwnership.ql |  1 +
 .../rules/A21-8-1/SignedValPassedToChar.ql    |  1 +
 ...ratorImplicitlyConvertedToConstIterator.ql |  1 +
 .../A3-1-1/ViolationsOfOneDefinitionRule.ql   |  1 +
 .../HeaderFileExpectedFileNameExtension.ql    |  1 +
 .../src/rules/A3-1-3/FileNameExtensionCpp.ql  |  1 +
 ...ExternalLinkageArrayWithoutExplicitSize.ql |  1 +
 ...ateFunctionDefinedInsideClassDefinition.ql |  1 +
 ...alAccessorAndMutatorFunctionsNotInlined.ql |  1 +
 ...onContainLessThanTwoLevelsOfIndirection.ql |  1 +
 .../src/rules/A5-1-2/ImplicitLambdaCapture.ql |  1 +
 .../LambdaExpressionWithoutParameterList.ql   |  1 +
 .../LambdaExpressionInLambdaExpression.ql     |  1 +
 .../A5-1-9/IdenticalLambdaExpressions.ql      |  1 +
 ...rVirtualFunctionWithNullPointerConstant.ql |  1 +
 .../rules/A5-3-2/NullPointersDereferenced.ql  |  1 +
 ...erToMemberAccessNonExistentClassMembers.ql |  1 +
 .../UninitializedStaticPointerToMemberUse.ql  |  1 +
 .../ExplicitConstructionOfUnnamedTemporary.ql |  1 +
 .../UnusedLoopCounterForContainerIteration.ql |  1 +
 .../src/rules/A6-6-1/GotoStatementUsed.ql     |  1 +
 .../src/rules/A7-1-4/RegisterKeywordUsed.ql   |  1 +
 .../ClassStructEnumDeclaredInDefinition.ql    |  1 +
 ...merationsNotDeclaredAsScopedEnumClasses.ql |  1 +
 ...NoneFirstOrAllEnumeratorsNotInitialized.ql |  1 +
 .../src/rules/A7-2-5/IntegerUsedForEnum.ql    |  1 +
 .../rules/A7-5-1/InvalidFunctionReturnType.ql |  1 +
 .../MoveFromConsumeParametersRvalRef.ql       |  1 +
 .../A8-4-6/ForwardForwardingReferences.ql     |  1 +
 ...nfusingUseOfInitializerListConstructors.ql |  1 +
 ...lassBothVirtualAndNonVirtualInHierarchy.ql |  1 +
 ...unctionOverriddenByAPureVirtualFunction.ql |  1 +
 ...peOfThisUsedFromConstructorOrDestructor.ql |  1 +
 .../CopyAssignmentOperatorNotDeclared.ql      |  1 +
 .../src/rules/M15-0-3/GotoToCatchBlock.ql     |  1 +
 .../src/rules/M15-0-3/SwitchToCatchBlock.ql   |  1 +
 .../M15-1-1/ExceptionThrownDuringThrow.ql     |  1 +
 .../src/rules/M15-1-2/NullThrownExplicitly.ql |  1 +
 .../rules/M15-1-3/EmptyThrowOutsideCatch.ql   |  1 +
 .../M15-3-1/ExceptionRaisedDuringStartup.ql   |  1 +
 .../ExceptionRaisedDuringTermination.ql       |  1 +
 ...edValueReferencedInDestructorCatchBlock.ql |  1 +
 .../CatchAllExplicitlyThrownExceptions.ql     |  1 +
 .../src/rules/M15-3-7/CatchAllHandlerLast.ql  |  1 +
 .../FunctionLikeMacroArgsContainHashToken.ql  |  1 +
 ...ssorOperatorGeneratedFromExpansionFound.ql |  1 +
 ...essorOperatorInOneOfTheTwoStandardForms.ql |  1 +
 .../SetjmpMacroAndTheLongjmpFunctionUsed.ql   |  1 +
 ...itGetenvAndSystemFromLibraryCstdlibUsed.ql |  1 +
 ...TimeHandlingFunctionsOfLibraryCtimeUsed.ql |  1 +
 .../rules/M2-13-2/UseOfNonZeroOctalEscape.ql  |  1 +
 .../rules/M2-13-2/UseOfNonZeroOctalLiteral.ql |  1 +
 .../M3-1-2/FunctionsDeclaredAtBlockScope.ql   |  1 +
 ...gStaticSpecifierOnFunctionRedeclaration.ql |  2 ++
 ...epresentationsOfFloatingPointValuesUsed.ql |  1 +
 .../rules/M4-10-1/NullUsedAsIntegerValue.ql   |  1 +
 .../LiteralZeroUsedAsNullPointerConstant.ql   |  1 +
 ...erAndDerivedPointerAccessDifferentArray.ql |  1 +
 .../PointerSubtractionOnDifferentArrays.ql    |  1 +
 .../src/rules/M5-18-1/CommaOperatorUsed.ql    |  1 +
 ...antUnsignedIntegerExpressionsWrapAround.ql |  1 +
 ...torsMixedWithOtherOperatorsInExpression.ql |  2 ++
 ...atorAndOperatorAndTheOperatorOverloaded.ql |  1 +
 ...ointerToAVirtualBaseClassCastToAPointer.ql |  1 +
 ...ExpressionWhoseUnderlyingTypeIsUnsigned.ql |  1 +
 .../rules/M5-3-3/UnaryOperatorOverloaded.ql   |  1 +
 .../rules/M6-2-1/AssignmentInSubExpression.ql |  1 +
 .../rules/M6-2-2/FloatsTestedForEquality.ql   |  1 +
 .../src/rules/M6-3-1/LoopCompoundCondition.ql |  1 +
 .../rules/M6-3-1/SwitchCompoundCondition.ql   |  1 +
 .../src/rules/M6-4-1/IfCompoundCondition.ql   |  1 +
 .../M6-4-3/SwitchDoesNotStartWithCase.ql      |  1 +
 .../M6-4-3/SwitchStatementNotWellFormed.ql    |  1 +
 .../src/rules/M6-4-4/NestedCaseInSwitch.ql    |  2 ++
 .../NonEmptySwitchClauseDoesNotTerminate.ql   |  1 +
 .../rules/M6-4-7/BooleanInSwitchCondition.ql  |  1 +
 .../rules/M6-5-2/NotEqualsInLoopCondition.ql  |  1 +
 .../LoopCounterModifiedWithinCondition.ql     |  1 +
 ...pControlVariableModifiedInLoopCondition.ql |  1 +
 ...ControlVariableModifiedInLoopExpression.ql |  1 +
 .../src/rules/M6-6-1/GotoBlockCondition.ql    |  1 +
 .../M6-6-2/GotoStatementJumpCondition.ql      |  1 +
 .../UsingDeclarationsUsedInHeaderFiles.ql     |  1 +
 .../FunctionReturnAutomaticVarCondition.ql    |  1 +
 .../M7-5-2/AssignmentOfEscapingAutoStorage.ql |  1 +
 ...ionParametersUseTheSameDefaultArguments.ql |  1 +
 ...nstMemberFunctionReturnsNonConstPointer.ql |  1 +
 cpp/baseline_suites/codeql-pack.lock.yml      | 24 +++++++++++++++++++
 .../codeql-suites/cpp-baseline-default.qls    | 17 +++++++++++++
 .../codeql-suites/cpp-baseline-safety.qls     | 15 ++++++++++++
 .../codeql-suites/cpp-baseline-style.qls      | 15 ++++++++++++
 cpp/baseline_suites/qlpack.yml                | 10 ++++++++
 ...NotAllowAMutexToGoOutOfScopeWhileLocked.ql |  1 +
 .../DoNotDestroyAMutexWhileItIsLocked.ql      |  1 +
 ...LocksAreReleasedOnExceptionalConditions.ql |  1 +
 ...reventBitFieldAccessFromMultipleThreads.ql |  1 +
 .../DeadlockByLockingInPredefinedOrder.ql     |  1 +
 ...pFunctionsThatCanSpuriouslyWakeUpInLoop.ql |  1 +
 ...eserveSafetyWhenUsingConditionVariables.ql |  1 +
 .../UsesValidContainerElementAccess.ql        |  1 +
 ...GenericCppLibraryFunctionsDoNotOverflow.ql |  1 +
 .../rules/CTR53-CPP/UseValidIteratorRanges.ql |  1 +
 ...SubtractIteratorsForDifferentContainers.ql |  1 +
 .../DoNotUseAnAdditiveOperatorOnAnIterator.ql |  1 +
 ...sePointerArithmeticOnPolymorphicObjects.ql |  1 +
 .../DoNotDefineACStyleVariadicFunction.ql     |  1 +
 ...tructorInitializedObjectHidesIdentifier.ql |  2 ++
 .../DCL53-CPP/LocalFunctionDeclaration.ql     |  1 +
 .../SingularOverloadOfMemoryFunction.ql       |  1 +
 .../DCL56-CPP/CyclesDuringStaticObjectInit.ql |  1 +
 ...eFromDestructorsOrDeallocationFunctions.ql |  1 +
 .../ModificationOfTheStandardNamespaces.ql    |  1 +
 .../DCL59-CPP/UnnamedNamespaceInHeaderFile.ql |  1 +
 .../ExitHandlerThrowsExceptionCert.ql         |  1 +
 .../ExplicitAbruptTerminationCert.ql          |  1 +
 .../RethrowNestedWithoutCaptureCert.ql        |  1 +
 .../rules/ERR51-CPP/HandleAllExceptions.ql    |  1 +
 .../ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql      |  2 ++
 ...rencedInConstructorDestructorCatchBlock.ql |  1 +
 .../ERR54-CPP/CatchBlockShadowingCert.ql      |  1 +
 .../ERR56-CPP/GuaranteeExceptionSafety.ql     |  1 +
 ...oNotLeakResourcesWhenHandlingExceptions.ql |  1 +
 ...onObjectsMustBeNothrowCopyConstructible.ql |  1 +
 .../CatchExceptionsByLvalueReference.ql       |  2 ++
 ...ectErrorsWhenConvertingAStringToANumber.ql |  1 +
 ...nArrayThroughAPointerOfTheIncorrectType.ql |  1 +
 .../EXP53-CPP/DoNotReadUninitializedMemory.ql |  1 +
 .../ObjectAccessedAfterLifetimeCert.ql        |  1 +
 .../ObjectAccessedBeforeLifetimeCert.ql       |  1 +
 .../DeletingPointerToIncompleteClass.ql       |  1 +
 .../PassNonTrivialObjectToVaStart.ql          |  1 +
 .../PassPromotablePrimitiveTypeToVaStart.ql   |  1 +
 .../EXP58-CPP/PassReferenceTypeToVaStart.ql   |  1 +
 ...apingLambdaObjectWithCaptureByReference.ql |  1 +
 ...rningLambdaObjectWithCaptureByReference.ql |  1 +
 .../MemcmpUsedToAccessObjectRepresentation.ql |  1 +
 .../MemcpyUsedToAccessObjectRepresentation.ql |  1 +
 .../MemsetUsedToAccessObjectRepresentation.ql |  1 +
 .../DoNotRelyOnTheValueOfAMovedFromObject.ql  |  1 +
 .../InterleavedInputOutputWithoutPosition.ql  |  1 +
 .../CloseFilesWhenTheyAreNoLongerNeeded.ql    |  1 +
 cpp/cert/src/rules/MEM50-CPP/UseAfterFree.ql  |  1 +
 ...DeallocateDynamicallyAllocatedResources.ql |  1 +
 .../DetectAndHandleMemoryAllocationErrors.ql  |  1 +
 ...gDestructorCallForManuallyManagedObject.ql |  1 +
 .../PlacementNewInsufficientStorageCert.ql    |  1 +
 .../PlacementNewNotProperlyAlignedCert.ql     |  1 +
 .../OperatorDeleteMissingPartnerCert.ql       |  1 +
 .../ThrowingNoThrowOperatorNewDeleteCert.ql   |  1 +
 .../ThrowingOperatorNewReturnsNullCert.ql     |  1 +
 ...ngOperatorNewThrowsInvalidExceptionCert.ql |  1 +
 ...ngDefaultOperatorNewForOverAlignedTypes.ql |  1 +
 ...UseRandForGeneratingPseudorandomNumbers.ql |  1 +
 .../BadlySeededRandomNumberGenerator.ql       |  1 +
 .../NonVoidFunctionDoesNotReturnCert.ql       |  1 +
 .../FunctionNoReturnAttributeConditionCert.ql |  1 +
 .../SignalHandlerMustBeAPlainOldFunction.ql   |  1 +
 ...lFunctionsFromConstructorsOrDestructors.ql |  1 +
 .../OOP51-CPP/DoNotSliceDerivedObjects.ql     |  1 +
 ...ymorphicObjectWithoutAVirtualDestructor.ql |  1 +
 .../UseCanonicalOrderForMemberInit.ql         |  1 +
 .../GracefullyHandleSelfCopyAssignment.ql     |  1 +
 ...sWithUninitializedStaticPointerToMember.ql |  1 +
 ...ointerToMemberToAccessNonexistentMember.ql |  1 +
 ...fPointerToMemberToAccessUndefinedMember.ql |  1 +
 .../HonorNewReplacementHandlerRequirements.ql |  1 +
 ...rminationReplacementHandlerRequirements.ql |  1 +
 ...dedOperatorsToCStandardLibraryFunctions.ql |  1 +
 ...yOperationsMustNotMutateTheSourceObject.ql |  1 +
 .../BasicStringMayNotBeNullTerminatedCert.ql  |  1 +
 ...tionMayNotNullTerminateCStyleStringCert.ql |  1 +
 ...tAttemptToCreateAStringFromANullPointer.ql |  1 +
 .../UseValidReferencesForElementsOfString.ql  |  1 +
 .../RangeCheckStringElementAccess.ql          |  1 +
 417 files changed, 570 insertions(+), 2 deletions(-)
 create mode 100644 c/baseline_suites/codeql-pack.lock.yml
 create mode 100644 c/baseline_suites/codeql-suites/c-baseline-default.qls
 create mode 100644 c/baseline_suites/codeql-suites/c-baseline-safety.qls
 create mode 100644 c/baseline_suites/codeql-suites/c-baseline-style.qls
 create mode 100644 c/baseline_suites/qlpack.yml
 create mode 100644 cpp/baseline_suites/codeql-pack.lock.yml
 create mode 100644 cpp/baseline_suites/codeql-suites/cpp-baseline-default.qls
 create mode 100644 cpp/baseline_suites/codeql-suites/cpp-baseline-safety.qls
 create mode 100644 cpp/baseline_suites/codeql-suites/cpp-baseline-style.qls
 create mode 100644 cpp/baseline_suites/qlpack.yml

diff --git a/.codeqlmanifest.json b/.codeqlmanifest.json
index b7d2d5604..fa1279fce 100644
--- a/.codeqlmanifest.json
+++ b/.codeqlmanifest.json
@@ -1,7 +1,9 @@
 {
   "provide": [
+    "cpp/baseline_suites/qlpack.yml",
     "cpp/*/src/qlpack.yml",
     "cpp/*/test/qlpack.yml",
+    "c/baseline_suites/qlpack.yml",
     "c/*/src/qlpack.yml",
     "c/*/test/qlpack.yml",
     "scripts/generate_modules/queries/qlpack.yml"
diff --git a/c/baseline_suites/codeql-pack.lock.yml b/c/baseline_suites/codeql-pack.lock.yml
new file mode 100644
index 000000000..a45ea8f43
--- /dev/null
+++ b/c/baseline_suites/codeql-pack.lock.yml
@@ -0,0 +1,24 @@
+---
+lockVersion: 1.0.0
+dependencies:
+  codeql/cpp-all:
+    version: 4.0.3
+  codeql/dataflow:
+    version: 2.0.3
+  codeql/mad:
+    version: 1.0.19
+  codeql/rangeanalysis:
+    version: 1.0.19
+  codeql/ssa:
+    version: 1.0.19
+  codeql/tutorial:
+    version: 1.0.19
+  codeql/typeflow:
+    version: 1.0.19
+  codeql/typetracking:
+    version: 2.0.3
+  codeql/util:
+    version: 2.0.6
+  codeql/xml:
+    version: 1.0.19
+compiled: false
diff --git a/c/baseline_suites/codeql-suites/c-baseline-default.qls b/c/baseline_suites/codeql-suites/c-baseline-default.qls
new file mode 100644
index 000000000..a53847075
--- /dev/null
+++ b/c/baseline_suites/codeql-suites/c-baseline-default.qls
@@ -0,0 +1,10 @@
+- description: C Baseline Coding Standards Queries
+- qlpack: codeql/cert-c-coding-standards
+- qlpack: codeql/misra-c-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - coding-standards/baseline/safety
+    - coding-standards/baseline/style
\ No newline at end of file
diff --git a/c/baseline_suites/codeql-suites/c-baseline-safety.qls b/c/baseline_suites/codeql-suites/c-baseline-safety.qls
new file mode 100644
index 000000000..6ad50277b
--- /dev/null
+++ b/c/baseline_suites/codeql-suites/c-baseline-safety.qls
@@ -0,0 +1,8 @@
+- description: C Baseline Safety Coding Standards Queries
+- qlpack: codeql/misra-c-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - coding-standards/baseline/safety
\ No newline at end of file
diff --git a/c/baseline_suites/codeql-suites/c-baseline-style.qls b/c/baseline_suites/codeql-suites/c-baseline-style.qls
new file mode 100644
index 000000000..bce7541ea
--- /dev/null
+++ b/c/baseline_suites/codeql-suites/c-baseline-style.qls
@@ -0,0 +1,8 @@
+- description: C Baseline Style Coding Standards Queries
+- qlpack: codeql/coding-standards-c-baseline
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - coding-standards/baseline/style
diff --git a/c/baseline_suites/qlpack.yml b/c/baseline_suites/qlpack.yml
new file mode 100644
index 000000000..982fa6814
--- /dev/null
+++ b/c/baseline_suites/qlpack.yml
@@ -0,0 +1,9 @@
+name: codeql/coding-standards-c-baseline
+version: 2.49.0-dev
+description: A set of baseline coding standards for C projects, combining hand picked rules from MISRA C and CERT C.
+suites: codeql-suites
+license: MIT
+default-suite-file: codeql-suites/c-baseline-default.qls
+dependencies:
+  codeql/misra-c-coding-standards: 2.49.0-dev
+  codeql/cert-c-coding-standards: 2.49.0-dev
diff --git a/c/cert/src/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.ql b/c/cert/src/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.ql
index 1356777e5..890f0a48e 100644
--- a/c/cert/src/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.ql
+++ b/c/cert/src/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/ARR36-C/DoNotRelatePointersThatDoNotReferToTheSameArray.ql b/c/cert/src/rules/ARR36-C/DoNotRelatePointersThatDoNotReferToTheSameArray.ql
index e42437042..274f381f3 100644
--- a/c/cert/src/rules/ARR36-C/DoNotRelatePointersThatDoNotReferToTheSameArray.ql
+++ b/c/cert/src/rules/ARR36-C/DoNotRelatePointersThatDoNotReferToTheSameArray.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p8
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql b/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql
index 1e03c089e..908e1aa85 100644
--- a/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql
+++ b/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON31-C/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql b/c/cert/src/rules/CON31-C/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
index 345623fe0..5d5af628a 100644
--- a/c/cert/src/rules/CON31-C/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
+++ b/c/cert/src/rules/CON31-C/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON31-C/DoNotDestroyAMutexWhileItIsLocked.ql b/c/cert/src/rules/CON31-C/DoNotDestroyAMutexWhileItIsLocked.ql
index 40c4e936d..c70fe0329 100644
--- a/c/cert/src/rules/CON31-C/DoNotDestroyAMutexWhileItIsLocked.ql
+++ b/c/cert/src/rules/CON31-C/DoNotDestroyAMutexWhileItIsLocked.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON32-C/PreventDataRacesWithMultipleThreads.ql b/c/cert/src/rules/CON32-C/PreventDataRacesWithMultipleThreads.ql
index 3ea9e1e1f..09bd234f6 100644
--- a/c/cert/src/rules/CON32-C/PreventDataRacesWithMultipleThreads.ql
+++ b/c/cert/src/rules/CON32-C/PreventDataRacesWithMultipleThreads.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p8
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON33-C/RaceConditionsWhenUsingLibraryFunctions.ql b/c/cert/src/rules/CON33-C/RaceConditionsWhenUsingLibraryFunctions.ql
index c9bcaa6bd..b58579d52 100644
--- a/c/cert/src/rules/CON33-C/RaceConditionsWhenUsingLibraryFunctions.ql
+++ b/c/cert/src/rules/CON33-C/RaceConditionsWhenUsingLibraryFunctions.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON36-C/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql b/c/cert/src/rules/CON36-C/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
index d0d948d9b..86b7e373c 100644
--- a/c/cert/src/rules/CON36-C/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
+++ b/c/cert/src/rules/CON36-C/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON38-C/PreserveSafetyWhenUsingConditionVariables.ql b/c/cert/src/rules/CON38-C/PreserveSafetyWhenUsingConditionVariables.ql
index 3b2ae558d..736416f11 100644
--- a/c/cert/src/rules/CON38-C/PreserveSafetyWhenUsingConditionVariables.ql
+++ b/c/cert/src/rules/CON38-C/PreserveSafetyWhenUsingConditionVariables.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON39-C/ThreadWasPreviouslyJoinedOrDetached.ql b/c/cert/src/rules/CON39-C/ThreadWasPreviouslyJoinedOrDetached.ql
index 6ef617ca7..30b56ad25 100644
--- a/c/cert/src/rules/CON39-C/ThreadWasPreviouslyJoinedOrDetached.ql
+++ b/c/cert/src/rules/CON39-C/ThreadWasPreviouslyJoinedOrDetached.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON40-C/AtomicVariableTwiceInExpression.ql b/c/cert/src/rules/CON40-C/AtomicVariableTwiceInExpression.ql
index 0ec195868..aad09e207 100644
--- a/c/cert/src/rules/CON40-C/AtomicVariableTwiceInExpression.ql
+++ b/c/cert/src/rules/CON40-C/AtomicVariableTwiceInExpression.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p8
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON41-C/WrapFunctionsThatCanFailSpuriouslyInLoop.ql b/c/cert/src/rules/CON41-C/WrapFunctionsThatCanFailSpuriouslyInLoop.ql
index 57be1bc48..47e5bb20f 100644
--- a/c/cert/src/rules/CON41-C/WrapFunctionsThatCanFailSpuriouslyInLoop.ql
+++ b/c/cert/src/rules/CON41-C/WrapFunctionsThatCanFailSpuriouslyInLoop.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql b/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql
index 2e1064ee9..c890aacf5 100644
--- a/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql
+++ b/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/DCL38-C/DeclaringAFlexibleArrayMember.ql b/c/cert/src/rules/DCL38-C/DeclaringAFlexibleArrayMember.ql
index d6000852c..e3cb2d1f2 100644
--- a/c/cert/src/rules/DCL38-C/DeclaringAFlexibleArrayMember.ql
+++ b/c/cert/src/rules/DCL38-C/DeclaringAFlexibleArrayMember.ql
@@ -16,6 +16,7 @@
  *       external/cert/priority/p3
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/cert/src/rules/DCL41-C/VariablesInsideSwitchStatement.ql b/c/cert/src/rules/DCL41-C/VariablesInsideSwitchStatement.ql
index 6f06174b9..3fd118f12 100644
--- a/c/cert/src/rules/DCL41-C/VariablesInsideSwitchStatement.ql
+++ b/c/cert/src/rules/DCL41-C/VariablesInsideSwitchStatement.ql
@@ -16,6 +16,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/cert/src/rules/ENV30-C/DoNotModifyTheReturnValueOfCertainFunctions.ql b/c/cert/src/rules/ENV30-C/DoNotModifyTheReturnValueOfCertainFunctions.ql
index f69a78ba2..c56bb6f90 100644
--- a/c/cert/src/rules/ENV30-C/DoNotModifyTheReturnValueOfCertainFunctions.ql
+++ b/c/cert/src/rules/ENV30-C/DoNotModifyTheReturnValueOfCertainFunctions.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/ENV31-C/EnvPointerIsInvalidAfterCertainOperations.ql b/c/cert/src/rules/ENV31-C/EnvPointerIsInvalidAfterCertainOperations.ql
index b4d4a74d5..072ee2766 100644
--- a/c/cert/src/rules/ENV31-C/EnvPointerIsInvalidAfterCertainOperations.ql
+++ b/c/cert/src/rules/ENV31-C/EnvPointerIsInvalidAfterCertainOperations.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/ENV32-C/ExitHandlersMustReturnNormally.ql b/c/cert/src/rules/ENV32-C/ExitHandlersMustReturnNormally.ql
index 19cf28b3e..40d3b15b9 100644
--- a/c/cert/src/rules/ENV32-C/ExitHandlersMustReturnNormally.ql
+++ b/c/cert/src/rules/ENV32-C/ExitHandlersMustReturnNormally.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p12
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvFunctions.ql b/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvFunctions.ql
index af54dfa82..2a9ee5d56 100644
--- a/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvFunctions.ql
+++ b/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvFunctions.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvironmentFunWarn.ql b/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvironmentFunWarn.ql
index 784b7898d..dd4c43104 100644
--- a/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvironmentFunWarn.ql
+++ b/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvironmentFunWarn.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/ERR30-C/ErrnoReadBeforeReturn.ql b/c/cert/src/rules/ERR30-C/ErrnoReadBeforeReturn.ql
index 13f7e4030..401fb4ce8 100644
--- a/c/cert/src/rules/ERR30-C/ErrnoReadBeforeReturn.ql
+++ b/c/cert/src/rules/ERR30-C/ErrnoReadBeforeReturn.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p8
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/ERR30-C/SetlocaleMightSetErrno.ql b/c/cert/src/rules/ERR30-C/SetlocaleMightSetErrno.ql
index a7ccf8c04..58468d1fe 100644
--- a/c/cert/src/rules/ERR30-C/SetlocaleMightSetErrno.ql
+++ b/c/cert/src/rules/ERR30-C/SetlocaleMightSetErrno.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p8
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.ql b/c/cert/src/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.ql
index 146d0cb30..3c0889892 100644
--- a/c/cert/src/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.ql
+++ b/c/cert/src/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p3
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP32-C/DoNotAccessVolatileObjectWithNonVolatileReference.ql b/c/cert/src/rules/EXP32-C/DoNotAccessVolatileObjectWithNonVolatileReference.ql
index 891b93bcd..e97716a89 100644
--- a/c/cert/src/rules/EXP32-C/DoNotAccessVolatileObjectWithNonVolatileReference.ql
+++ b/c/cert/src/rules/EXP32-C/DoNotAccessVolatileObjectWithNonVolatileReference.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql b/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql
index 3f7d9ae14..15594de9e 100644
--- a/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql
+++ b/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql b/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql
index 6d223dab7..fbcfaa2aa 100644
--- a/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql
+++ b/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP37-C/DoNotCallFunctionsWithIncompatibleArguments.ql b/c/cert/src/rules/EXP37-C/DoNotCallFunctionsWithIncompatibleArguments.ql
index 4c5ba5750..0b7dde938 100644
--- a/c/cert/src/rules/EXP37-C/DoNotCallFunctionsWithIncompatibleArguments.ql
+++ b/c/cert/src/rules/EXP37-C/DoNotCallFunctionsWithIncompatibleArguments.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql b/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql
index 9d8e4b16d..9ffde045b 100644
--- a/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql
+++ b/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
index 4aced5713..4879c4675 100644
--- a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
+++ b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql b/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
index 31618785d..c0b7c8afc 100644
--- a/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
+++ b/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP46-C/DoNotUseABitwiseOperatorWithABooleanLikeOperand.ql b/c/cert/src/rules/EXP46-C/DoNotUseABitwiseOperatorWithABooleanLikeOperand.ql
index 549e57236..6a7e406e0 100644
--- a/c/cert/src/rules/EXP46-C/DoNotUseABitwiseOperatorWithABooleanLikeOperand.ql
+++ b/c/cert/src/rules/EXP46-C/DoNotUseABitwiseOperatorWithABooleanLikeOperand.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p9
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO30-C/ExcludeUserInputFromFormatStrings.ql b/c/cert/src/rules/FIO30-C/ExcludeUserInputFromFormatStrings.ql
index 81ecf56cc..b38a62c81 100644
--- a/c/cert/src/rules/FIO30-C/ExcludeUserInputFromFormatStrings.ql
+++ b/c/cert/src/rules/FIO30-C/ExcludeUserInputFromFormatStrings.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql b/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql
index ad3a2c819..111e17b13 100644
--- a/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql
+++ b/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p12
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO38-C/DoNotCopyAFileObject.ql b/c/cert/src/rules/FIO38-C/DoNotCopyAFileObject.ql
index 5b5a04339..ab66a396a 100644
--- a/c/cert/src/rules/FIO38-C/DoNotCopyAFileObject.ql
+++ b/c/cert/src/rules/FIO38-C/DoNotCopyAFileObject.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO39-C/DoNotAlternatelyIOFromAStreamWithoutPositioning.ql b/c/cert/src/rules/FIO39-C/DoNotAlternatelyIOFromAStreamWithoutPositioning.ql
index 09289d1f7..1df6e26be 100644
--- a/c/cert/src/rules/FIO39-C/DoNotAlternatelyIOFromAStreamWithoutPositioning.ql
+++ b/c/cert/src/rules/FIO39-C/DoNotAlternatelyIOFromAStreamWithoutPositioning.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.ql b/c/cert/src/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.ql
index 9b0882ac6..5fbe5695e 100644
--- a/c/cert/src/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.ql
+++ b/c/cert/src/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO41-C/DoNotCallGetcAndPutcWithSideEffects.ql b/c/cert/src/rules/FIO41-C/DoNotCallGetcAndPutcWithSideEffects.ql
index 5c7d75960..5986fb70e 100644
--- a/c/cert/src/rules/FIO41-C/DoNotCallGetcAndPutcWithSideEffects.ql
+++ b/c/cert/src/rules/FIO41-C/DoNotCallGetcAndPutcWithSideEffects.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql b/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql
index 85369b502..5ce99960a 100644
--- a/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql
+++ b/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO46-C/UndefinedBehaviorAccessingAClosedFile.ql b/c/cert/src/rules/FIO46-C/UndefinedBehaviorAccessingAClosedFile.ql
index dc52dca48..a0075a5ef 100644
--- a/c/cert/src/rules/FIO46-C/UndefinedBehaviorAccessingAClosedFile.ql
+++ b/c/cert/src/rules/FIO46-C/UndefinedBehaviorAccessingAClosedFile.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO47-C/UseValidSpecifiers.ql b/c/cert/src/rules/FIO47-C/UseValidSpecifiers.ql
index 8ed99d454..4758431e4 100644
--- a/c/cert/src/rules/FIO47-C/UseValidSpecifiers.ql
+++ b/c/cert/src/rules/FIO47-C/UseValidSpecifiers.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/FLP30-C/FloatingPointLoopCounters.ql b/c/cert/src/rules/FLP30-C/FloatingPointLoopCounters.ql
index a042d80ba..24686fae5 100644
--- a/c/cert/src/rules/FLP30-C/FloatingPointLoopCounters.ql
+++ b/c/cert/src/rules/FLP30-C/FloatingPointLoopCounters.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/FLP37-C/MemcmpUsedToCompareFloats.ql b/c/cert/src/rules/FLP37-C/MemcmpUsedToCompareFloats.ql
index 8735a804f..e23b66b26 100644
--- a/c/cert/src/rules/FLP37-C/MemcmpUsedToCompareFloats.ql
+++ b/c/cert/src/rules/FLP37-C/MemcmpUsedToCompareFloats.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/INT35-C/UseCorrectIntegerPrecisions.ql b/c/cert/src/rules/INT35-C/UseCorrectIntegerPrecisions.ql
index 1bc372506..e8487eb2a 100644
--- a/c/cert/src/rules/INT35-C/UseCorrectIntegerPrecisions.ql
+++ b/c/cert/src/rules/INT35-C/UseCorrectIntegerPrecisions.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/MEM30-C/DoNotAccessFreedMemory.ql b/c/cert/src/rules/MEM30-C/DoNotAccessFreedMemory.ql
index 59ab0df67..53283c041 100644
--- a/c/cert/src/rules/MEM30-C/DoNotAccessFreedMemory.ql
+++ b/c/cert/src/rules/MEM30-C/DoNotAccessFreedMemory.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/MEM33-C/AllocStructsWithAFlexibleArrayMemberDynamically.ql b/c/cert/src/rules/MEM33-C/AllocStructsWithAFlexibleArrayMemberDynamically.ql
index 2ed5035ff..19f94ecc3 100644
--- a/c/cert/src/rules/MEM33-C/AllocStructsWithAFlexibleArrayMemberDynamically.ql
+++ b/c/cert/src/rules/MEM33-C/AllocStructsWithAFlexibleArrayMemberDynamically.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p3
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/MEM33-C/CopyStructsWithAFlexibleArrayMemberDynamically.ql b/c/cert/src/rules/MEM33-C/CopyStructsWithAFlexibleArrayMemberDynamically.ql
index b4d2a9127..ab184f11e 100644
--- a/c/cert/src/rules/MEM33-C/CopyStructsWithAFlexibleArrayMemberDynamically.ql
+++ b/c/cert/src/rules/MEM33-C/CopyStructsWithAFlexibleArrayMemberDynamically.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p3
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql b/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql
index 90c34a44a..92e95552a 100644
--- a/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql
+++ b/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.ql b/c/cert/src/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.ql
index 722e6fff8..b971a1797 100644
--- a/c/cert/src/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.ql
+++ b/c/cert/src/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/MSC32-C/ProperlySeedPseudorandomNumberGenerators.ql b/c/cert/src/rules/MSC32-C/ProperlySeedPseudorandomNumberGenerators.ql
index 85623d939..ca20b4858 100644
--- a/c/cert/src/rules/MSC32-C/ProperlySeedPseudorandomNumberGenerators.ql
+++ b/c/cert/src/rules/MSC32-C/ProperlySeedPseudorandomNumberGenerators.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql b/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql
index 67fa83e85..4fe66932f 100644
--- a/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql
+++ b/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p27
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql b/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
index 56613c194..4d711d45f 100644
--- a/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
+++ b/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p3
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/MSC40-C/DoNotViolateInLineLinkageConstraints.ql b/c/cert/src/rules/MSC40-C/DoNotViolateInLineLinkageConstraints.ql
index 746cea2e9..30cc1f9f4 100644
--- a/c/cert/src/rules/MSC40-C/DoNotViolateInLineLinkageConstraints.ql
+++ b/c/cert/src/rules/MSC40-C/DoNotViolateInLineLinkageConstraints.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/PRE31-C/SideEffectsInArgumentsToUnsafeMacros.ql b/c/cert/src/rules/PRE31-C/SideEffectsInArgumentsToUnsafeMacros.ql
index 322048f6d..54775b0bf 100644
--- a/c/cert/src/rules/PRE31-C/SideEffectsInArgumentsToUnsafeMacros.ql
+++ b/c/cert/src/rules/PRE31-C/SideEffectsInArgumentsToUnsafeMacros.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p3
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql b/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql
index 0a777dc25..ba5c05c64 100644
--- a/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql
+++ b/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql
@@ -16,6 +16,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql b/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql
index e5dc33f81..2e1e5c922 100644
--- a/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql
+++ b/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/SIG34-C/DoNotCallSignalFromInterruptibleSignalHandlers.ql b/c/cert/src/rules/SIG34-C/DoNotCallSignalFromInterruptibleSignalHandlers.ql
index 0586c40c3..76f4f0c1b 100644
--- a/c/cert/src/rules/SIG34-C/DoNotCallSignalFromInterruptibleSignalHandlers.ql
+++ b/c/cert/src/rules/SIG34-C/DoNotCallSignalFromInterruptibleSignalHandlers.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p3
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql b/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql
index bd65019f9..8d67cf267 100644
--- a/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql
+++ b/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p1
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql b/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql
index 397e1bfc9..f77f54948 100644
--- a/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql
+++ b/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p9
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql b/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
index 437b13f7f..55efeb071 100644
--- a/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
+++ b/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
@@ -16,6 +16,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/STR37-C/ToCharacterHandlingFunctionsRepresentableAsUChar.ql b/c/cert/src/rules/STR37-C/ToCharacterHandlingFunctionsRepresentableAsUChar.ql
index a29dbd34b..8bbe46682 100644
--- a/c/cert/src/rules/STR37-C/ToCharacterHandlingFunctionsRepresentableAsUChar.ql
+++ b/c/cert/src/rules/STR37-C/ToCharacterHandlingFunctionsRepresentableAsUChar.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p3
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/cert/src/rules/STR38-C/DoNotConfuseNarrowAndWideFunctions.ql b/c/cert/src/rules/STR38-C/DoNotConfuseNarrowAndWideFunctions.ql
index 58b2b1c7d..c0b9d2dfc 100644
--- a/c/cert/src/rules/STR38-C/DoNotConfuseNarrowAndWideFunctions.ql
+++ b/c/cert/src/rules/STR38-C/DoNotConfuseNarrowAndWideFunctions.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p27
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql b/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql
index 338437b5b..6ba7ec185 100644
--- a/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql
+++ b/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql
@@ -12,6 +12,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql b/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql
index 272a411f0..fc3415dc4 100644
--- a/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql
+++ b/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql b/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql
index 5dd78fc34..861c1a0ba 100644
--- a/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql
+++ b/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql
@@ -10,6 +10,7 @@
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql b/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
index 582715e34..20bb65df2 100644
--- a/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
+++ b/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
@@ -12,6 +12,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql b/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql
index 5d949f56e..a444d81e1 100644
--- a/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql
+++ b/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       concurrency
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql b/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql
index 4994c4ea6..80b9476ec 100644
--- a/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql
+++ b/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql
@@ -10,6 +10,7 @@
  *       security
  *       maintainability
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql b/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
index 645285f43..d7a16f782 100644
--- a/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
+++ b/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql b/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
index 9d10522ec..541ec4c0b 100644
--- a/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
+++ b/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
index ba800885e..8fab94050 100644
--- a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
+++ b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
index 9f9953aa6..8cc95a79a 100644
--- a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
+++ b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql b/c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql
index 2b5cdaa85..c722c9ca5 100644
--- a/c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql
+++ b/c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
index e8abf1bbf..4896ca306 100644
--- a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
+++ b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-11-10/AtomicQualifierAppliedToVoid.ql b/c/misra/src/rules/RULE-11-10/AtomicQualifierAppliedToVoid.ql
index 6440e8407..a9955db89 100644
--- a/c/misra/src/rules/RULE-11-10/AtomicQualifierAppliedToVoid.ql
+++ b/c/misra/src/rules/RULE-11-10/AtomicQualifierAppliedToVoid.ql
@@ -11,6 +11,7 @@
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/c/2012/amendment4
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql b/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
index 5c16dc1af..22e2a00c2 100644
--- a/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
+++ b/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql b/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
index 82ac620aa..bd0ecba46 100644
--- a/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
+++ b/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
index 28b256e85..63f8fe5e7 100644
--- a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
+++ b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
@@ -9,6 +9,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql b/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql
index bccb38280..41da3185e 100644
--- a/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql
@@ -9,6 +9,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql b/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql
index 1ebbf184b..810227c8f 100644
--- a/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql
+++ b/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql
@@ -16,6 +16,7 @@
  *       security
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql b/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql
index 2e080419e..58c6f4072 100644
--- a/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql
+++ b/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-12-5
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-12-6/AtomicAggregateObjectDirectlyAccessed.ql b/c/misra/src/rules/RULE-12-6/AtomicAggregateObjectDirectlyAccessed.ql
index 5085e5dc7..b47b8f8de 100644
--- a/c/misra/src/rules/RULE-12-6/AtomicAggregateObjectDirectlyAccessed.ql
+++ b/c/misra/src/rules/RULE-12-6/AtomicAggregateObjectDirectlyAccessed.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       concurrency
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql b/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql
index 69ecbede5..dcf720e6d 100644
--- a/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedAtomicReads.ql b/c/misra/src/rules/RULE-13-2/UnsequencedAtomicReads.ql
index 86756668a..7e6a834b5 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedAtomicReads.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedAtomicReads.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
index 90b0315e8..2d288607e 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
index c840947b1..fc4bb8f9a 100644
--- a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql b/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql
index 759ad9b06..f96982032 100644
--- a/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql
+++ b/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql b/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql
index 3d351c898..59c1173e4 100644
--- a/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql
+++ b/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql b/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql
index 1bd270875..5372cb9c3 100644
--- a/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql
+++ b/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql
@@ -12,6 +12,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
index 84c7dbd40..1d1353de6 100644
--- a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
+++ b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
@@ -10,6 +10,7 @@
  *       security
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql b/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql
index 623fb9bae..9da281a0d 100644
--- a/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql
+++ b/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql
@@ -10,6 +10,8 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
index a88f3170d..d51e3493e 100644
--- a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
+++ b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
index 9cc5bf9dd..db2313fb2 100644
--- a/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
index f84c14241..3c6a45bb5 100644
--- a/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
@@ -1,6 +1,6 @@
 /**
  * @id c/misra/selection-compound-condition
- * @name RULE-15-6: The statement forming the body of a slection statement shall be a compound statement
+ * @name RULE-15-6: The statement forming the body of a selection statement shall be a compound statement
  * @description if the body of a selection statement is not enclosed in braces, then this can lead
  *              to incorrect execution, and is hard for developers to maintain.
  * @kind problem
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql
index 1d446f323..05780aa28 100644
--- a/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql b/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql
index 4ceca23d8..fc16d511c 100644
--- a/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql
+++ b/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql b/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql
index 644994562..059a3f3a7 100644
--- a/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql
+++ b/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql b/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql
index 45ad0519b..237e4d7c0 100644
--- a/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql
+++ b/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql b/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql
index 5a93477b9..f69a0a740 100644
--- a/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql
+++ b/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-16-5
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql b/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql
index 0259f8023..bd59c8344 100644
--- a/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql
+++ b/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
index 4dd939eff..a26699f06 100644
--- a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
+++ b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql b/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql
index af6c9bcca..f956fcec6 100644
--- a/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql
+++ b/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql b/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql
index 1529a403c..df21468e0 100644
--- a/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql
+++ b/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql
@@ -12,6 +12,8 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/style
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql b/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
index 1a142ddb2..194b89fce 100644
--- a/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
+++ b/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
@@ -1,6 +1,6 @@
 /**
  * @id c/misra/array-function-argument-number-of-elements
- * @name RULE-17-5: An array founction argument shall have an appropriate number of elements
+ * @name RULE-17-5: An array function argument shall have an appropriate number of elements
  * @description The function argument corresponding to an array parameter shall have an appropriate
  *              number of elements.
  * @kind problem
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql b/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql
index 0a1232b6a..fce081cba 100644
--- a/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql
+++ b/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
index dedac9da9..10989476f 100644
--- a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
+++ b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
index dc1433d5e..81a0996fb 100644
--- a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
@@ -12,6 +12,7 @@
  *       correctness
  *       security
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql b/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql
index f467c4180..419199502 100644
--- a/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql
+++ b/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql b/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql
index efbc8d133..a89d12152 100644
--- a/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql
+++ b/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-6/ThreadLocalObjectAddressCopiedToGlobalObject.ql b/c/misra/src/rules/RULE-18-6/ThreadLocalObjectAddressCopiedToGlobalObject.ql
index 6a520447d..d29bfde9f 100644
--- a/c/misra/src/rules/RULE-18-6/ThreadLocalObjectAddressCopiedToGlobalObject.ql
+++ b/c/misra/src/rules/RULE-18-6/ThreadLocalObjectAddressCopiedToGlobalObject.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql b/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql
index 73f0732ba..f840e5ec5 100644
--- a/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql
+++ b/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql
@@ -9,6 +9,8 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
index cf19c02ec..d6e868364 100644
--- a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
@@ -10,6 +10,8 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql b/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
index da7321485..9593ec19b 100644
--- a/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
+++ b/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       security
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql b/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
index 5ccc8316e..ad9856a42 100644
--- a/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
+++ b/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       security
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql b/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql
index 31c24dcdd..5460824b8 100644
--- a/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql
+++ b/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql b/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
index 33de4f84b..76b4e44e5 100644
--- a/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
+++ b/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-1/UnreachableCode.ql b/c/misra/src/rules/RULE-2-1/UnreachableCode.ql
index 020338913..f8c5c90c6 100644
--- a/c/misra/src/rules/RULE-2-1/UnreachableCode.ql
+++ b/c/misra/src/rules/RULE-2-1/UnreachableCode.ql
@@ -11,6 +11,7 @@
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-2/DeadCode.ql b/c/misra/src/rules/RULE-2-2/DeadCode.ql
index 97c380860..05f6fc17a 100644
--- a/c/misra/src/rules/RULE-2-2/DeadCode.ql
+++ b/c/misra/src/rules/RULE-2-2/DeadCode.ql
@@ -11,6 +11,7 @@
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql b/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql
index b4c6bbf42..03a3284ee 100644
--- a/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql
+++ b/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql
@@ -11,6 +11,7 @@
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql b/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
index 2b5a8e8c1..2943bcd00 100644
--- a/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
+++ b/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
@@ -11,6 +11,7 @@
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql b/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql
index 7838c5fc1..76e5d0731 100644
--- a/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql
+++ b/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql
@@ -11,6 +11,7 @@
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-8/UnusedObjectDefinition.ql b/c/misra/src/rules/RULE-2-8/UnusedObjectDefinition.ql
index 13355b7f7..66d155800 100644
--- a/c/misra/src/rules/RULE-2-8/UnusedObjectDefinition.ql
+++ b/c/misra/src/rules/RULE-2-8/UnusedObjectDefinition.ql
@@ -10,6 +10,7 @@
  *       performance
  *       external/misra/c/2012/amendment4
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql b/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql
index ba78abcb5..a4e0c1726 100644
--- a/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql
+++ b/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
index fc87186d3..e1299f1a8 100644
--- a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
+++ b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql b/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql
index d9942c3e5..0e2e6525b 100644
--- a/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql
+++ b/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql b/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql
index 210e081bb..e1dbfad2d 100644
--- a/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql
+++ b/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql
@@ -13,6 +13,7 @@
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql b/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql
index 15bec51bf..a224ce0ea 100644
--- a/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql b/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql
index e0fc8e451..017cc85d6 100644
--- a/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql
+++ b/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql b/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql
index be6f3c00f..d4852715c 100644
--- a/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql
+++ b/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql
@@ -12,6 +12,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql b/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql
index b7ccf534f..9ec9197c7 100644
--- a/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql
+++ b/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-21-13
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql b/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
index b487f5b9b..c9d68e459 100644
--- a/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
+++ b/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql b/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
index 28dce7b63..ed1619b03 100644
--- a/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
+++ b/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-21-15
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql b/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql
index 31d3434c5..fa2a37d83 100644
--- a/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql
+++ b/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql
@@ -11,6 +11,7 @@
  *       security
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql b/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql
index 22ccc14b6..f12ca680d 100644
--- a/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql
+++ b/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql
@@ -12,6 +12,7 @@
  *       security
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql b/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql
index 6fa3ad92b..2d342d789 100644
--- a/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql
+++ b/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql
index 6441add7f..5adb6adcd 100644
--- a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql
+++ b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql
index e7e97e263..194ecf15b 100644
--- a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql
+++ b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-23/TgMathArgumentsWithDifferingStandardType.ql b/c/misra/src/rules/RULE-21-23/TgMathArgumentsWithDifferingStandardType.ql
index 34d3b62b2..6f844caab 100644
--- a/c/misra/src/rules/RULE-21-23/TgMathArgumentsWithDifferingStandardType.ql
+++ b/c/misra/src/rules/RULE-21-23/TgMathArgumentsWithDifferingStandardType.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql b/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
index 8066cc80c..189bf5746 100644
--- a/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
+++ b/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
@@ -10,6 +10,7 @@
  *       security
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-26/TimedlockOnInappropriateMutexType.ql b/c/misra/src/rules/RULE-21-26/TimedlockOnInappropriateMutexType.ql
index 929eb5bd0..e666077cc 100644
--- a/c/misra/src/rules/RULE-21-26/TimedlockOnInappropriateMutexType.ql
+++ b/c/misra/src/rules/RULE-21-26/TimedlockOnInappropriateMutexType.ql
@@ -11,6 +11,7 @@
  *       concurrency
  *       external/misra/c/2012/amendment4
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql b/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql
index 88ad0aa6d..924788fa6 100644
--- a/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql
+++ b/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql b/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
index ce781403b..7f67be808 100644
--- a/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
+++ b/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql b/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql
index d888d87b6..022b83f45 100644
--- a/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql
+++ b/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql
@@ -11,6 +11,7 @@
  *       security
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql b/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql
index ca5853dac..b9d590097 100644
--- a/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql
+++ b/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql
@@ -11,6 +11,7 @@
  *       security
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql b/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql
index 50e535093..432cd3229 100644
--- a/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql
+++ b/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-11/ThreadPreviouslyJoinedOrDetached.ql b/c/misra/src/rules/RULE-22-11/ThreadPreviouslyJoinedOrDetached.ql
index 1a6476b1a..ab6059c43 100644
--- a/c/misra/src/rules/RULE-22-11/ThreadPreviouslyJoinedOrDetached.ql
+++ b/c/misra/src/rules/RULE-22-11/ThreadPreviouslyJoinedOrDetached.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       concurrency
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-14/MutexInitWithInvalidMutexType.ql b/c/misra/src/rules/RULE-22-14/MutexInitWithInvalidMutexType.ql
index a122a0bec..383f3c49b 100644
--- a/c/misra/src/rules/RULE-22-14/MutexInitWithInvalidMutexType.ql
+++ b/c/misra/src/rules/RULE-22-14/MutexInitWithInvalidMutexType.ql
@@ -10,6 +10,7 @@
  *       concurrency
  *       external/misra/c/2012/amendment4
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.ql b/c/misra/src/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.ql
index c86c9b9d9..87e389b17 100644
--- a/c/misra/src/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.ql
+++ b/c/misra/src/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.ql
@@ -11,6 +11,7 @@
  *       concurrency
  *       external/misra/c/2012/amendment4
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-17/InvalidOperationOnUnlockedMutex.ql b/c/misra/src/rules/RULE-22-17/InvalidOperationOnUnlockedMutex.ql
index d85183a83..2d1b850e5 100644
--- a/c/misra/src/rules/RULE-22-17/InvalidOperationOnUnlockedMutex.ql
+++ b/c/misra/src/rules/RULE-22-17/InvalidOperationOnUnlockedMutex.ql
@@ -11,6 +11,7 @@
  *       concurrency
  *       external/misra/c/2012/amendment4
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-19/ConditionVariableUsedWithMultipleMutexes.ql b/c/misra/src/rules/RULE-22-19/ConditionVariableUsedWithMultipleMutexes.ql
index 0d5aa5399..e19d4cb02 100644
--- a/c/misra/src/rules/RULE-22-19/ConditionVariableUsedWithMultipleMutexes.ql
+++ b/c/misra/src/rules/RULE-22-19/ConditionVariableUsedWithMultipleMutexes.ql
@@ -11,6 +11,7 @@
  *       concurrency
  *       external/misra/c/2012/amendment4
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql b/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql
index cdbe8e2c1..aa1977e31 100644
--- a/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql
+++ b/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql
@@ -11,6 +11,7 @@
  *       security
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-20/ThreadStorageNotInitializedBeforeUse.ql b/c/misra/src/rules/RULE-22-20/ThreadStorageNotInitializedBeforeUse.ql
index 1edf4aa9c..793779284 100644
--- a/c/misra/src/rules/RULE-22-20/ThreadStorageNotInitializedBeforeUse.ql
+++ b/c/misra/src/rules/RULE-22-20/ThreadStorageNotInitializedBeforeUse.ql
@@ -11,6 +11,7 @@
  *       concurrency
  *       external/misra/c/2012/amendment4
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql b/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
index 642813bba..0b7810702 100644
--- a/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
+++ b/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql b/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
index 2439d4ca4..28b751b79 100644
--- a/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
+++ b/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql b/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql
index 05cc4e343..db6c6c64b 100644
--- a/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql
+++ b/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql b/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql
index 64318dbed..834d43475 100644
--- a/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql
+++ b/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql b/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql
index 1da495ca2..90a0d3923 100644
--- a/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql
+++ b/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql b/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql
index 6a39070ef..efaa64725 100644
--- a/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql
+++ b/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql b/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql
index 274bf5b2a..e06f57127 100644
--- a/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql
+++ b/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-1/GenericSelectionDoesntDependOnMacroArgument.ql b/c/misra/src/rules/RULE-23-1/GenericSelectionDoesntDependOnMacroArgument.ql
index 1a76339f5..9754a1bef 100644
--- a/c/misra/src/rules/RULE-23-1/GenericSelectionDoesntDependOnMacroArgument.ql
+++ b/c/misra/src/rules/RULE-23-1/GenericSelectionDoesntDependOnMacroArgument.ql
@@ -10,6 +10,7 @@
  *       maintainability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-1/GenericSelectionNotExpandedFromAMacro.ql b/c/misra/src/rules/RULE-23-1/GenericSelectionNotExpandedFromAMacro.ql
index 603c44e8e..3134960d8 100644
--- a/c/misra/src/rules/RULE-23-1/GenericSelectionNotExpandedFromAMacro.ql
+++ b/c/misra/src/rules/RULE-23-1/GenericSelectionNotExpandedFromAMacro.ql
@@ -9,6 +9,7 @@
  *       maintainability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-2/GenericSelectionNotFromMacroWithSideEffects.ql b/c/misra/src/rules/RULE-23-2/GenericSelectionNotFromMacroWithSideEffects.ql
index d7fcb13d7..08c438e7e 100644
--- a/c/misra/src/rules/RULE-23-2/GenericSelectionNotFromMacroWithSideEffects.ql
+++ b/c/misra/src/rules/RULE-23-2/GenericSelectionNotFromMacroWithSideEffects.ql
@@ -10,6 +10,7 @@
  *       maintainability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-3/GenericWithoutNonDefaultAssociation.ql b/c/misra/src/rules/RULE-23-3/GenericWithoutNonDefaultAssociation.ql
index dc4ab081d..7240d0a7a 100644
--- a/c/misra/src/rules/RULE-23-3/GenericWithoutNonDefaultAssociation.ql
+++ b/c/misra/src/rules/RULE-23-3/GenericWithoutNonDefaultAssociation.ql
@@ -10,6 +10,7 @@
  *       maintainability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-4/GenericAssociationWithUnselectableType.ql b/c/misra/src/rules/RULE-23-4/GenericAssociationWithUnselectableType.ql
index 2d707548f..f29f68868 100644
--- a/c/misra/src/rules/RULE-23-4/GenericAssociationWithUnselectableType.ql
+++ b/c/misra/src/rules/RULE-23-4/GenericAssociationWithUnselectableType.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-5/DangerousDefaultSelectionForPointerInGeneric.ql b/c/misra/src/rules/RULE-23-5/DangerousDefaultSelectionForPointerInGeneric.ql
index f2961e263..7369e9520 100644
--- a/c/misra/src/rules/RULE-23-5/DangerousDefaultSelectionForPointerInGeneric.ql
+++ b/c/misra/src/rules/RULE-23-5/DangerousDefaultSelectionForPointerInGeneric.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-7/InvalidGenericMacroArgumentEvaluation.ql b/c/misra/src/rules/RULE-23-7/InvalidGenericMacroArgumentEvaluation.ql
index 04952ae96..f5026aa99 100644
--- a/c/misra/src/rules/RULE-23-7/InvalidGenericMacroArgumentEvaluation.ql
+++ b/c/misra/src/rules/RULE-23-7/InvalidGenericMacroArgumentEvaluation.ql
@@ -11,6 +11,7 @@
  *       maintainability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-8/DefaultGenericSelectionNotFirstOrLast.ql b/c/misra/src/rules/RULE-23-8/DefaultGenericSelectionNotFirstOrLast.ql
index 6e443bd16..85b00d647 100644
--- a/c/misra/src/rules/RULE-23-8/DefaultGenericSelectionNotFirstOrLast.ql
+++ b/c/misra/src/rules/RULE-23-8/DefaultGenericSelectionNotFirstOrLast.ql
@@ -10,6 +10,7 @@
  *       maintainability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql b/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql
index f1fd85b12..e51b6e728 100644
--- a/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql
+++ b/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql
@@ -12,6 +12,8 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
index 0f04a7362..6193daead 100644
--- a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
+++ b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
@@ -12,6 +12,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql b/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql
index 2c2c302bc..0b1d6be56 100644
--- a/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql
+++ b/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql b/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql
index eb24d1c09..65329cc89 100644
--- a/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql
+++ b/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql b/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql
index d8a78cb68..734cbe2e0 100644
--- a/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql
+++ b/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
index 142a0b542..b941391c7 100644
--- a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
+++ b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-6-2
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql b/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
index 4befbb9dd..1dbca0094 100644
--- a/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
+++ b/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql b/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
index 47e88196d..0ff64db47 100644
--- a/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
+++ b/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql b/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql
index 6484372f5..88dbb3cd7 100644
--- a/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql
+++ b/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql
@@ -10,6 +10,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql b/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql
index 250c00ca2..3dd7c4180 100644
--- a/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql
+++ b/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql
@@ -10,6 +10,8 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
index 6ebabc381..c3488e1e6 100644
--- a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
+++ b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql b/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql
index cff7d0df5..fb5ccaea5 100644
--- a/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql
+++ b/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql
@@ -10,6 +10,7 @@
  *       security
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
index dc82f63d1..7260dd042 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
@@ -11,6 +11,7 @@
  *       readability
  *       maintainability
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
index df9f3f2d1..fbb81d046 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
@@ -11,6 +11,8 @@
  *       readability
  *       maintainability
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql b/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
index 4a0cd9d50..fb0e39aad 100644
--- a/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
+++ b/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
@@ -10,6 +10,7 @@
  *       readability
  *       maintainability
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql b/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
index f4e0d93d9..4f70f08a4 100644
--- a/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
+++ b/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
@@ -10,6 +10,7 @@
  *       external/misra/c/2012/amendment3
  *       readability
  *       external/misra/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql b/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
index 1136dd714..37f5888a7 100644
--- a/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
+++ b/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql
index c3a5ce897..8fabae7f8 100644
--- a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql
+++ b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql
@@ -10,6 +10,8 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
index 877ef19d2..fc397d6d5 100644
--- a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
+++ b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
@@ -10,6 +10,8 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql b/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql
index f3204ef2e..c78d56ab5 100644
--- a/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql
+++ b/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql
@@ -10,6 +10,7 @@
  *       security
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql b/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql
index c5a9ae481..5a1d833ad 100644
--- a/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql
+++ b/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql b/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql
index d10c8315e..724d5d94c 100644
--- a/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql
+++ b/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql
@@ -11,6 +11,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql b/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
index dfe3fd8ff..873b4d243 100644
--- a/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
+++ b/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
@@ -12,6 +12,7 @@
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-9-7/UninitializedAtomicObject.ql b/c/misra/src/rules/RULE-9-7/UninitializedAtomicObject.ql
index 5f7fb803d..9eb3d25e9 100644
--- a/c/misra/src/rules/RULE-9-7/UninitializedAtomicObject.ql
+++ b/c/misra/src/rules/RULE-9-7/UninitializedAtomicObject.ql
@@ -10,6 +10,7 @@
  *       concurrency
  *       external/misra/c/2012/amendment4
  *       external/misra/obligation/mandatory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A0-1-1/UselessAssignment.ql b/cpp/autosar/src/rules/A0-1-1/UselessAssignment.ql
index a1c6fb1fa..16ab39817 100644
--- a/cpp/autosar/src/rules/A0-1-1/UselessAssignment.ql
+++ b/cpp/autosar/src/rules/A0-1-1/UselessAssignment.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A1-1-1/CStandardLibraryHeadersAreDeprecated.ql b/cpp/autosar/src/rules/A1-1-1/CStandardLibraryHeadersAreDeprecated.ql
index 11a305628..047aba1bc 100644
--- a/cpp/autosar/src/rules/A1-1-1/CStandardLibraryHeadersAreDeprecated.ql
+++ b/cpp/autosar/src/rules/A1-1-1/CStandardLibraryHeadersAreDeprecated.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A10-1-1/ClassDerivedFromMoreThanOneNonInterfaceBaseClass.ql b/cpp/autosar/src/rules/A10-1-1/ClassDerivedFromMoreThanOneNonInterfaceBaseClass.ql
index a0a69f4ec..749c3c520 100644
--- a/cpp/autosar/src/rules/A10-1-1/ClassDerivedFromMoreThanOneNonInterfaceBaseClass.ql
+++ b/cpp/autosar/src/rules/A10-1-1/ClassDerivedFromMoreThanOneNonInterfaceBaseClass.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A10-3-5/UserDefinedAssignmentOperatorVirtual.ql b/cpp/autosar/src/rules/A10-3-5/UserDefinedAssignmentOperatorVirtual.ql
index bb51e38a6..27321c1a2 100644
--- a/cpp/autosar/src/rules/A10-3-5/UserDefinedAssignmentOperatorVirtual.ql
+++ b/cpp/autosar/src/rules/A10-3-5/UserDefinedAssignmentOperatorVirtual.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A12-1-4/ConstructorWithFundamentalArgMissingExplicit.ql b/cpp/autosar/src/rules/A12-1-4/ConstructorWithFundamentalArgMissingExplicit.ql
index 6f0cf190a..8614341e5 100644
--- a/cpp/autosar/src/rules/A12-1-4/ConstructorWithFundamentalArgMissingExplicit.ql
+++ b/cpp/autosar/src/rules/A12-1-4/ConstructorWithFundamentalArgMissingExplicit.ql
@@ -12,6 +12,8 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A12-4-1/DestructorOfABaseClassNotPublicVirtual.ql b/cpp/autosar/src/rules/A12-4-1/DestructorOfABaseClassNotPublicVirtual.ql
index c534f9e59..1a2e89a64 100644
--- a/cpp/autosar/src/rules/A12-4-1/DestructorOfABaseClassNotPublicVirtual.ql
+++ b/cpp/autosar/src/rules/A12-4-1/DestructorOfABaseClassNotPublicVirtual.ql
@@ -14,6 +14,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A12-6-1/ClassDataMembersInitializationCondition.ql b/cpp/autosar/src/rules/A12-6-1/ClassDataMembersInitializationCondition.ql
index 71e2fc9a0..a04bb0a8c 100644
--- a/cpp/autosar/src/rules/A12-6-1/ClassDataMembersInitializationCondition.ql
+++ b/cpp/autosar/src/rules/A12-6-1/ClassDataMembersInitializationCondition.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A12-8-4/MoveConstructorUsesCopySemantics.ql b/cpp/autosar/src/rules/A12-8-4/MoveConstructorUsesCopySemantics.ql
index a71d49d84..6541f8bce 100644
--- a/cpp/autosar/src/rules/A12-8-4/MoveConstructorUsesCopySemantics.ql
+++ b/cpp/autosar/src/rules/A12-8-4/MoveConstructorUsesCopySemantics.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql b/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql
index 4e6b7d6f0..1ffcfd8b7 100644
--- a/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql
+++ b/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql
@@ -11,6 +11,8 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A13-5-2/UserDefinedConversionOperatorsNotDefinedExplicit.ql b/cpp/autosar/src/rules/A13-5-2/UserDefinedConversionOperatorsNotDefinedExplicit.ql
index ced94c5bd..b8441dfc0 100644
--- a/cpp/autosar/src/rules/A13-5-2/UserDefinedConversionOperatorsNotDefinedExplicit.ql
+++ b/cpp/autosar/src/rules/A13-5-2/UserDefinedConversionOperatorsNotDefinedExplicit.ql
@@ -10,6 +10,8 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A13-5-4/OppositeOperatorsNotDefinedInTermsOfOther.ql b/cpp/autosar/src/rules/A13-5-4/OppositeOperatorsNotDefinedInTermsOfOther.ql
index 0f8b57186..f347ad909 100644
--- a/cpp/autosar/src/rules/A13-5-4/OppositeOperatorsNotDefinedInTermsOfOther.ql
+++ b/cpp/autosar/src/rules/A13-5-4/OppositeOperatorsNotDefinedInTermsOfOther.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A13-6-1/UseCorrectIntervalForDigitSequencesSeparators.ql b/cpp/autosar/src/rules/A13-6-1/UseCorrectIntervalForDigitSequencesSeparators.ql
index b484509e6..24c6a8075 100644
--- a/cpp/autosar/src/rules/A13-6-1/UseCorrectIntervalForDigitSequencesSeparators.ql
+++ b/cpp/autosar/src/rules/A13-6-1/UseCorrectIntervalForDigitSequencesSeparators.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A14-5-1/TemplateConstructorOverloadResolution.ql b/cpp/autosar/src/rules/A14-5-1/TemplateConstructorOverloadResolution.ql
index 932fceba3..6ce1f6e3c 100644
--- a/cpp/autosar/src/rules/A14-5-1/TemplateConstructorOverloadResolution.ql
+++ b/cpp/autosar/src/rules/A14-5-1/TemplateConstructorOverloadResolution.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.ql b/cpp/autosar/src/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.ql
index 94214e899..62005d0b9 100644
--- a/cpp/autosar/src/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.ql
+++ b/cpp/autosar/src/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-1-1/OnlyThrowStdExceptionDerivedTypes.ql b/cpp/autosar/src/rules/A15-1-1/OnlyThrowStdExceptionDerivedTypes.ql
index c4c457bef..7e836b845 100644
--- a/cpp/autosar/src/rules/A15-1-1/OnlyThrowStdExceptionDerivedTypes.ql
+++ b/cpp/autosar/src/rules/A15-1-1/OnlyThrowStdExceptionDerivedTypes.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql b/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
index b2f101082..ca7df79d8 100644
--- a/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
+++ b/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql b/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql
index 1b3a3cfed..4213b8273 100644
--- a/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql
+++ b/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-3-3/MissingCatchHandlerInMain.ql b/cpp/autosar/src/rules/A15-3-3/MissingCatchHandlerInMain.ql
index ce3a10f31..78fbfc530 100644
--- a/cpp/autosar/src/rules/A15-3-3/MissingCatchHandlerInMain.ql
+++ b/cpp/autosar/src/rules/A15-3-3/MissingCatchHandlerInMain.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-3-4/CatchAllEllipsisUsedInNonMain.ql b/cpp/autosar/src/rules/A15-3-4/CatchAllEllipsisUsedInNonMain.ql
index 61f520e00..c95a19f5e 100644
--- a/cpp/autosar/src/rules/A15-3-4/CatchAllEllipsisUsedInNonMain.ql
+++ b/cpp/autosar/src/rules/A15-3-4/CatchAllEllipsisUsedInNonMain.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/non-automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-4-1/UseOfDynamicExceptionSpecification.ql b/cpp/autosar/src/rules/A15-4-1/UseOfDynamicExceptionSpecification.ql
index a12602c7a..a14efc0fe 100644
--- a/cpp/autosar/src/rules/A15-4-1/UseOfDynamicExceptionSpecification.ql
+++ b/cpp/autosar/src/rules/A15-4-1/UseOfDynamicExceptionSpecification.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecification.ql b/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecification.ql
index b8ad76cc3..500354aa3 100644
--- a/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecification.ql
+++ b/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecification.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecificationForOverriders.ql b/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecificationForOverriders.ql
index 87f7af2ad..e53065358 100644
--- a/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecificationForOverriders.ql
+++ b/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecificationForOverriders.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptFalseSpecification.ql b/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptFalseSpecification.ql
index 69ffae87e..95aa75c7d 100644
--- a/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptFalseSpecification.ql
+++ b/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptFalseSpecification.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptTrueSpecification.ql b/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptTrueSpecification.ql
index fc4ac468c..6bb345a0d 100644
--- a/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptTrueSpecification.ql
+++ b/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptTrueSpecification.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A16-2-1/CharactersOccurInHeaderFileNameOrInIncludeDirective.ql b/cpp/autosar/src/rules/A16-2-1/CharactersOccurInHeaderFileNameOrInIncludeDirective.ql
index 18a373e93..25e291335 100644
--- a/cpp/autosar/src/rules/A16-2-1/CharactersOccurInHeaderFileNameOrInIncludeDirective.ql
+++ b/cpp/autosar/src/rules/A16-2-1/CharactersOccurInHeaderFileNameOrInIncludeDirective.ql
@@ -11,6 +11,8 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A16-6-1/ErrorDirectiveUsed.ql b/cpp/autosar/src/rules/A16-6-1/ErrorDirectiveUsed.ql
index 136de7cee..300d75825 100644
--- a/cpp/autosar/src/rules/A16-6-1/ErrorDirectiveUsed.ql
+++ b/cpp/autosar/src/rules/A16-6-1/ErrorDirectiveUsed.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-0-2/StringNumberConversionMissingErrorCheck.ql b/cpp/autosar/src/rules/A18-0-2/StringNumberConversionMissingErrorCheck.ql
index 99d539317..aafe2eb9a 100644
--- a/cpp/autosar/src/rules/A18-0-2/StringNumberConversionMissingErrorCheck.ql
+++ b/cpp/autosar/src/rules/A18-0-2/StringNumberConversionMissingErrorCheck.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-0-2/UseOfUnsafeCStringToNumberConversion.ql b/cpp/autosar/src/rules/A18-0-2/UseOfUnsafeCStringToNumberConversion.ql
index 9300bb9d1..561cf2e6e 100644
--- a/cpp/autosar/src/rules/A18-0-2/UseOfUnsafeCStringToNumberConversion.ql
+++ b/cpp/autosar/src/rules/A18-0-2/UseOfUnsafeCStringToNumberConversion.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
index 5bbe18192..5c83ee543 100644
--- a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
+++ b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-1-3/AutoPtrTypeUsed.ql b/cpp/autosar/src/rules/A18-1-3/AutoPtrTypeUsed.ql
index 4b9d187dc..0dff356a2 100644
--- a/cpp/autosar/src/rules/A18-1-3/AutoPtrTypeUsed.ql
+++ b/cpp/autosar/src/rules/A18-1-3/AutoPtrTypeUsed.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql b/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql
index 353c98513..c4ec8d687 100644
--- a/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql
+++ b/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedGlobally.ql b/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedGlobally.ql
index 244dfefc5..179670024 100644
--- a/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedGlobally.ql
+++ b/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedGlobally.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql b/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql
index 5d4cd71c7..c8e2d4bfc 100644
--- a/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql
+++ b/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-3/NewArrayDeleteMismatch.ql b/cpp/autosar/src/rules/A18-5-3/NewArrayDeleteMismatch.ql
index 24be6ef3e..dfec63f56 100644
--- a/cpp/autosar/src/rules/A18-5-3/NewArrayDeleteMismatch.ql
+++ b/cpp/autosar/src/rules/A18-5-3/NewArrayDeleteMismatch.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-3/NewDeleteArrayMismatch.ql b/cpp/autosar/src/rules/A18-5-3/NewDeleteArrayMismatch.ql
index cbf956ce1..ac15e5913 100644
--- a/cpp/autosar/src/rules/A18-5-3/NewDeleteArrayMismatch.ql
+++ b/cpp/autosar/src/rules/A18-5-3/NewDeleteArrayMismatch.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql b/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql
index cf83f055b..6c9689a06 100644
--- a/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql
+++ b/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-9/ThrowingNoThrowOperatorNewDeleteAutosar.ql b/cpp/autosar/src/rules/A18-5-9/ThrowingNoThrowOperatorNewDeleteAutosar.ql
index f2cf835a2..be1ebff14 100644
--- a/cpp/autosar/src/rules/A18-5-9/ThrowingNoThrowOperatorNewDeleteAutosar.ql
+++ b/cpp/autosar/src/rules/A18-5-9/ThrowingNoThrowOperatorNewDeleteAutosar.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewReturnsNullAutosar.ql b/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewReturnsNullAutosar.ql
index 3d8e14c85..7b73a52c7 100644
--- a/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewReturnsNullAutosar.ql
+++ b/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewReturnsNullAutosar.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewThrowsInvalidExceptionAutosar.ql b/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewThrowsInvalidExceptionAutosar.ql
index c85eba435..749127565 100644
--- a/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewThrowsInvalidExceptionAutosar.ql
+++ b/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewThrowsInvalidExceptionAutosar.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-9-1/BindUsed.ql b/cpp/autosar/src/rules/A18-9-1/BindUsed.ql
index 9f594f1ed..2b5b6379f 100644
--- a/cpp/autosar/src/rules/A18-9-1/BindUsed.ql
+++ b/cpp/autosar/src/rules/A18-9-1/BindUsed.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql b/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
index 72de362eb..d31796983 100644
--- a/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
+++ b/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-9-3/MoveUsedOnConstObjects.ql b/cpp/autosar/src/rules/A18-9-3/MoveUsedOnConstObjects.ql
index e268ec75d..18952c4ea 100644
--- a/cpp/autosar/src/rules/A18-9-3/MoveUsedOnConstObjects.ql
+++ b/cpp/autosar/src/rules/A18-9-3/MoveUsedOnConstObjects.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql b/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql
index a3acf916e..c5a81aad8 100644
--- a/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql
+++ b/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql
@@ -9,6 +9,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql b/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
index 0f1d9a327..545d1880f 100644
--- a/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
+++ b/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A2-13-4/StringLiteralsAssignedToNonConstantPointers.ql b/cpp/autosar/src/rules/A2-13-4/StringLiteralsAssignedToNonConstantPointers.ql
index 1e0f29743..1814f1838 100644
--- a/cpp/autosar/src/rules/A2-13-4/StringLiteralsAssignedToNonConstantPointers.ql
+++ b/cpp/autosar/src/rules/A2-13-4/StringLiteralsAssignedToNonConstantPointers.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A2-13-6/UniversalCharacterNamesUsedOutsideCharacterOrStringLiterals.ql b/cpp/autosar/src/rules/A2-13-6/UniversalCharacterNamesUsedOutsideCharacterOrStringLiterals.ql
index 234a1c917..61e7a3fd3 100644
--- a/cpp/autosar/src/rules/A2-13-6/UniversalCharacterNamesUsedOutsideCharacterOrStringLiterals.ql
+++ b/cpp/autosar/src/rules/A2-13-6/UniversalCharacterNamesUsedOutsideCharacterOrStringLiterals.ql
@@ -14,6 +14,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql b/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
index cd7d7c42c..27925c0f8 100644
--- a/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
+++ b/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
@@ -13,6 +13,8 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A20-8-2/UniquePtrNotUsedToRepresentExclusiveOwnership.ql b/cpp/autosar/src/rules/A20-8-2/UniquePtrNotUsedToRepresentExclusiveOwnership.ql
index aafce46f7..ea4a1c8e9 100644
--- a/cpp/autosar/src/rules/A20-8-2/UniquePtrNotUsedToRepresentExclusiveOwnership.ql
+++ b/cpp/autosar/src/rules/A20-8-2/UniquePtrNotUsedToRepresentExclusiveOwnership.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A21-8-1/SignedValPassedToChar.ql b/cpp/autosar/src/rules/A21-8-1/SignedValPassedToChar.ql
index 3467ff513..854fbb1cf 100644
--- a/cpp/autosar/src/rules/A21-8-1/SignedValPassedToChar.ql
+++ b/cpp/autosar/src/rules/A21-8-1/SignedValPassedToChar.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql b/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql
index d67058868..a04330488 100644
--- a/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql
+++ b/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql
@@ -9,6 +9,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-1/ViolationsOfOneDefinitionRule.ql b/cpp/autosar/src/rules/A3-1-1/ViolationsOfOneDefinitionRule.ql
index 4beb91e8f..cae4b01b5 100644
--- a/cpp/autosar/src/rules/A3-1-1/ViolationsOfOneDefinitionRule.ql
+++ b/cpp/autosar/src/rules/A3-1-1/ViolationsOfOneDefinitionRule.ql
@@ -16,6 +16,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-2/HeaderFileExpectedFileNameExtension.ql b/cpp/autosar/src/rules/A3-1-2/HeaderFileExpectedFileNameExtension.ql
index c4032537c..8a12dae8e 100644
--- a/cpp/autosar/src/rules/A3-1-2/HeaderFileExpectedFileNameExtension.ql
+++ b/cpp/autosar/src/rules/A3-1-2/HeaderFileExpectedFileNameExtension.ql
@@ -14,6 +14,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-3/FileNameExtensionCpp.ql b/cpp/autosar/src/rules/A3-1-3/FileNameExtensionCpp.ql
index 15847cd90..120254d7f 100644
--- a/cpp/autosar/src/rules/A3-1-3/FileNameExtensionCpp.ql
+++ b/cpp/autosar/src/rules/A3-1-3/FileNameExtensionCpp.ql
@@ -14,6 +14,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-4/ExternalLinkageArrayWithoutExplicitSize.ql b/cpp/autosar/src/rules/A3-1-4/ExternalLinkageArrayWithoutExplicitSize.ql
index 3a6f33516..fbe504d56 100644
--- a/cpp/autosar/src/rules/A3-1-4/ExternalLinkageArrayWithoutExplicitSize.ql
+++ b/cpp/autosar/src/rules/A3-1-4/ExternalLinkageArrayWithoutExplicitSize.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-5/NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.ql b/cpp/autosar/src/rules/A3-1-5/NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.ql
index 9b250e487..e694e92fe 100644
--- a/cpp/autosar/src/rules/A3-1-5/NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.ql
+++ b/cpp/autosar/src/rules/A3-1-5/NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/design
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-6/TrivialAccessorAndMutatorFunctionsNotInlined.ql b/cpp/autosar/src/rules/A3-1-6/TrivialAccessorAndMutatorFunctionsNotInlined.ql
index 39971f398..7b2da0c6e 100644
--- a/cpp/autosar/src/rules/A3-1-6/TrivialAccessorAndMutatorFunctionsNotInlined.ql
+++ b/cpp/autosar/src/rules/A3-1-6/TrivialAccessorAndMutatorFunctionsNotInlined.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/design
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-0-3/DeclarationContainLessThanTwoLevelsOfIndirection.ql b/cpp/autosar/src/rules/A5-0-3/DeclarationContainLessThanTwoLevelsOfIndirection.ql
index 2e866c9f2..301949f61 100644
--- a/cpp/autosar/src/rules/A5-0-3/DeclarationContainLessThanTwoLevelsOfIndirection.ql
+++ b/cpp/autosar/src/rules/A5-0-3/DeclarationContainLessThanTwoLevelsOfIndirection.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-1-2/ImplicitLambdaCapture.ql b/cpp/autosar/src/rules/A5-1-2/ImplicitLambdaCapture.ql
index 77cf0ba35..8d65e4932 100644
--- a/cpp/autosar/src/rules/A5-1-2/ImplicitLambdaCapture.ql
+++ b/cpp/autosar/src/rules/A5-1-2/ImplicitLambdaCapture.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-1-3/LambdaExpressionWithoutParameterList.ql b/cpp/autosar/src/rules/A5-1-3/LambdaExpressionWithoutParameterList.ql
index 7d3d630d9..1aec8c4ef 100644
--- a/cpp/autosar/src/rules/A5-1-3/LambdaExpressionWithoutParameterList.ql
+++ b/cpp/autosar/src/rules/A5-1-3/LambdaExpressionWithoutParameterList.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-1-8/LambdaExpressionInLambdaExpression.ql b/cpp/autosar/src/rules/A5-1-8/LambdaExpressionInLambdaExpression.ql
index 26a755eb2..88a98dbdd 100644
--- a/cpp/autosar/src/rules/A5-1-8/LambdaExpressionInLambdaExpression.ql
+++ b/cpp/autosar/src/rules/A5-1-8/LambdaExpressionInLambdaExpression.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-1-9/IdenticalLambdaExpressions.ql b/cpp/autosar/src/rules/A5-1-9/IdenticalLambdaExpressions.ql
index 152095571..d7ef42c93 100644
--- a/cpp/autosar/src/rules/A5-1-9/IdenticalLambdaExpressions.ql
+++ b/cpp/autosar/src/rules/A5-1-9/IdenticalLambdaExpressions.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
index 825347754..93d467a62 100644
--- a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
+++ b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-3-2/NullPointersDereferenced.ql b/cpp/autosar/src/rules/A5-3-2/NullPointersDereferenced.ql
index e342c53d0..c73365564 100644
--- a/cpp/autosar/src/rules/A5-3-2/NullPointersDereferenced.ql
+++ b/cpp/autosar/src/rules/A5-3-2/NullPointersDereferenced.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-5-1/PointerToMemberAccessNonExistentClassMembers.ql b/cpp/autosar/src/rules/A5-5-1/PointerToMemberAccessNonExistentClassMembers.ql
index e3a78ce30..46f4cd7dd 100644
--- a/cpp/autosar/src/rules/A5-5-1/PointerToMemberAccessNonExistentClassMembers.ql
+++ b/cpp/autosar/src/rules/A5-5-1/PointerToMemberAccessNonExistentClassMembers.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-5-1/UninitializedStaticPointerToMemberUse.ql b/cpp/autosar/src/rules/A5-5-1/UninitializedStaticPointerToMemberUse.ql
index b6aa698e6..268ebe30c 100644
--- a/cpp/autosar/src/rules/A5-5-1/UninitializedStaticPointerToMemberUse.ql
+++ b/cpp/autosar/src/rules/A5-5-1/UninitializedStaticPointerToMemberUse.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A6-2-2/ExplicitConstructionOfUnnamedTemporary.ql b/cpp/autosar/src/rules/A6-2-2/ExplicitConstructionOfUnnamedTemporary.ql
index 8da5de687..5e1a54259 100644
--- a/cpp/autosar/src/rules/A6-2-2/ExplicitConstructionOfUnnamedTemporary.ql
+++ b/cpp/autosar/src/rules/A6-2-2/ExplicitConstructionOfUnnamedTemporary.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A6-5-1/UnusedLoopCounterForContainerIteration.ql b/cpp/autosar/src/rules/A6-5-1/UnusedLoopCounterForContainerIteration.ql
index 29b660a46..028e2049b 100644
--- a/cpp/autosar/src/rules/A6-5-1/UnusedLoopCounterForContainerIteration.ql
+++ b/cpp/autosar/src/rules/A6-5-1/UnusedLoopCounterForContainerIteration.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql b/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
index 03b891e6d..046a9bb1f 100644
--- a/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
+++ b/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-1-4/RegisterKeywordUsed.ql b/cpp/autosar/src/rules/A7-1-4/RegisterKeywordUsed.ql
index 9a5b6abfb..deea04b15 100644
--- a/cpp/autosar/src/rules/A7-1-4/RegisterKeywordUsed.ql
+++ b/cpp/autosar/src/rules/A7-1-4/RegisterKeywordUsed.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-1-9/ClassStructEnumDeclaredInDefinition.ql b/cpp/autosar/src/rules/A7-1-9/ClassStructEnumDeclaredInDefinition.ql
index b46c44596..108df61dc 100644
--- a/cpp/autosar/src/rules/A7-1-9/ClassStructEnumDeclaredInDefinition.ql
+++ b/cpp/autosar/src/rules/A7-1-9/ClassStructEnumDeclaredInDefinition.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-2-3/EnumerationsNotDeclaredAsScopedEnumClasses.ql b/cpp/autosar/src/rules/A7-2-3/EnumerationsNotDeclaredAsScopedEnumClasses.ql
index 26e877d75..2e453999b 100644
--- a/cpp/autosar/src/rules/A7-2-3/EnumerationsNotDeclaredAsScopedEnumClasses.ql
+++ b/cpp/autosar/src/rules/A7-2-3/EnumerationsNotDeclaredAsScopedEnumClasses.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-2-4/NoneFirstOrAllEnumeratorsNotInitialized.ql b/cpp/autosar/src/rules/A7-2-4/NoneFirstOrAllEnumeratorsNotInitialized.ql
index d8d3ee024..e439d0f2a 100644
--- a/cpp/autosar/src/rules/A7-2-4/NoneFirstOrAllEnumeratorsNotInitialized.ql
+++ b/cpp/autosar/src/rules/A7-2-4/NoneFirstOrAllEnumeratorsNotInitialized.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-2-5/IntegerUsedForEnum.ql b/cpp/autosar/src/rules/A7-2-5/IntegerUsedForEnum.ql
index af0d66f22..eb9f37628 100644
--- a/cpp/autosar/src/rules/A7-2-5/IntegerUsedForEnum.ql
+++ b/cpp/autosar/src/rules/A7-2-5/IntegerUsedForEnum.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/design
  *       external/autosar/enforcement/non-automated
  *       external/autosar/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql b/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql
index c36bda6cd..0eca2915a 100644
--- a/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql
+++ b/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A8-4-5/MoveFromConsumeParametersRvalRef.ql b/cpp/autosar/src/rules/A8-4-5/MoveFromConsumeParametersRvalRef.ql
index 0284b3ba1..472340eb2 100644
--- a/cpp/autosar/src/rules/A8-4-5/MoveFromConsumeParametersRvalRef.ql
+++ b/cpp/autosar/src/rules/A8-4-5/MoveFromConsumeParametersRvalRef.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/design
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A8-4-6/ForwardForwardingReferences.ql b/cpp/autosar/src/rules/A8-4-6/ForwardForwardingReferences.ql
index d594d2379..40aaea446 100644
--- a/cpp/autosar/src/rules/A8-4-6/ForwardForwardingReferences.ql
+++ b/cpp/autosar/src/rules/A8-4-6/ForwardForwardingReferences.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/design
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql b/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
index 180cbf722..582a00503 100644
--- a/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
+++ b/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
index c16e5461f..1315c3923 100644
--- a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
+++ b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M10-3-3/VirtualFunctionOverriddenByAPureVirtualFunction.ql b/cpp/autosar/src/rules/M10-3-3/VirtualFunctionOverriddenByAPureVirtualFunction.ql
index 479d09eb6..5661aca4b 100644
--- a/cpp/autosar/src/rules/M10-3-3/VirtualFunctionOverriddenByAPureVirtualFunction.ql
+++ b/cpp/autosar/src/rules/M10-3-3/VirtualFunctionOverriddenByAPureVirtualFunction.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql b/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
index 4b6c037ab..40a394ba4 100644
--- a/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
+++ b/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql b/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql
index 1b41fe81b..7a483303b 100644
--- a/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql
+++ b/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-0-3/GotoToCatchBlock.ql b/cpp/autosar/src/rules/M15-0-3/GotoToCatchBlock.ql
index 67fc3944f..0e5753750 100644
--- a/cpp/autosar/src/rules/M15-0-3/GotoToCatchBlock.ql
+++ b/cpp/autosar/src/rules/M15-0-3/GotoToCatchBlock.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-0-3/SwitchToCatchBlock.ql b/cpp/autosar/src/rules/M15-0-3/SwitchToCatchBlock.ql
index 559c43620..454a4c3bc 100644
--- a/cpp/autosar/src/rules/M15-0-3/SwitchToCatchBlock.ql
+++ b/cpp/autosar/src/rules/M15-0-3/SwitchToCatchBlock.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-1-1/ExceptionThrownDuringThrow.ql b/cpp/autosar/src/rules/M15-1-1/ExceptionThrownDuringThrow.ql
index 4a7f626d0..c30fcac30 100644
--- a/cpp/autosar/src/rules/M15-1-1/ExceptionThrownDuringThrow.ql
+++ b/cpp/autosar/src/rules/M15-1-1/ExceptionThrownDuringThrow.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-1-2/NullThrownExplicitly.ql b/cpp/autosar/src/rules/M15-1-2/NullThrownExplicitly.ql
index 7dfed7aad..5d0098173 100644
--- a/cpp/autosar/src/rules/M15-1-2/NullThrownExplicitly.ql
+++ b/cpp/autosar/src/rules/M15-1-2/NullThrownExplicitly.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql b/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
index 9f99e7c35..e9d96f328 100644
--- a/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
+++ b/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringStartup.ql b/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringStartup.ql
index f5ca9c210..bc06b5f0d 100644
--- a/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringStartup.ql
+++ b/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringStartup.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringTermination.ql b/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringTermination.ql
index 54a6ba89e..856b2d322 100644
--- a/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringTermination.ql
+++ b/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringTermination.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-3-3/DestroyedValueReferencedInDestructorCatchBlock.ql b/cpp/autosar/src/rules/M15-3-3/DestroyedValueReferencedInDestructorCatchBlock.ql
index ba0c499ad..0d07ca005 100644
--- a/cpp/autosar/src/rules/M15-3-3/DestroyedValueReferencedInDestructorCatchBlock.ql
+++ b/cpp/autosar/src/rules/M15-3-3/DestroyedValueReferencedInDestructorCatchBlock.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-3-4/CatchAllExplicitlyThrownExceptions.ql b/cpp/autosar/src/rules/M15-3-4/CatchAllExplicitlyThrownExceptions.ql
index e324dd128..d242c4ec6 100644
--- a/cpp/autosar/src/rules/M15-3-4/CatchAllExplicitlyThrownExceptions.ql
+++ b/cpp/autosar/src/rules/M15-3-4/CatchAllExplicitlyThrownExceptions.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-3-7/CatchAllHandlerLast.ql b/cpp/autosar/src/rules/M15-3-7/CatchAllHandlerLast.ql
index 23c75bff9..1a69853de 100644
--- a/cpp/autosar/src/rules/M15-3-7/CatchAllHandlerLast.ql
+++ b/cpp/autosar/src/rules/M15-3-7/CatchAllHandlerLast.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M16-0-5/FunctionLikeMacroArgsContainHashToken.ql b/cpp/autosar/src/rules/M16-0-5/FunctionLikeMacroArgsContainHashToken.ql
index 38312b7b1..2b3dba0f9 100644
--- a/cpp/autosar/src/rules/M16-0-5/FunctionLikeMacroArgsContainHashToken.ql
+++ b/cpp/autosar/src/rules/M16-0-5/FunctionLikeMacroArgsContainHashToken.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorGeneratedFromExpansionFound.ql b/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorGeneratedFromExpansionFound.ql
index 761ef27eb..f71cf43db 100644
--- a/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorGeneratedFromExpansionFound.ql
+++ b/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorGeneratedFromExpansionFound.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorInOneOfTheTwoStandardForms.ql b/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorInOneOfTheTwoStandardForms.ql
index 2a5387506..a2d10d6cc 100644
--- a/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorInOneOfTheTwoStandardForms.ql
+++ b/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorInOneOfTheTwoStandardForms.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.ql b/cpp/autosar/src/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.ql
index 5e821fc5f..d6ec60794 100644
--- a/cpp/autosar/src/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.ql
+++ b/cpp/autosar/src/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M18-0-3/LibraryFunctionsAbortExitGetenvAndSystemFromLibraryCstdlibUsed.ql b/cpp/autosar/src/rules/M18-0-3/LibraryFunctionsAbortExitGetenvAndSystemFromLibraryCstdlibUsed.ql
index 8aabeac1e..a0ee1c2b3 100644
--- a/cpp/autosar/src/rules/M18-0-3/LibraryFunctionsAbortExitGetenvAndSystemFromLibraryCstdlibUsed.ql
+++ b/cpp/autosar/src/rules/M18-0-3/LibraryFunctionsAbortExitGetenvAndSystemFromLibraryCstdlibUsed.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M18-0-4/TimeHandlingFunctionsOfLibraryCtimeUsed.ql b/cpp/autosar/src/rules/M18-0-4/TimeHandlingFunctionsOfLibraryCtimeUsed.ql
index 9ba6ad319..209d29c05 100644
--- a/cpp/autosar/src/rules/M18-0-4/TimeHandlingFunctionsOfLibraryCtimeUsed.ql
+++ b/cpp/autosar/src/rules/M18-0-4/TimeHandlingFunctionsOfLibraryCtimeUsed.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalEscape.ql b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalEscape.ql
index f054b3b25..6baeebe73 100644
--- a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalEscape.ql
+++ b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalEscape.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
index b689edab6..dabf04ed1 100644
--- a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
+++ b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql b/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
index 87d9af147..541cde7a1 100644
--- a/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
+++ b/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M3-3-2/MissingStaticSpecifierOnFunctionRedeclaration.ql b/cpp/autosar/src/rules/M3-3-2/MissingStaticSpecifierOnFunctionRedeclaration.ql
index e01f2e334..a20d530ba 100644
--- a/cpp/autosar/src/rules/M3-3-2/MissingStaticSpecifierOnFunctionRedeclaration.ql
+++ b/cpp/autosar/src/rules/M3-3-2/MissingStaticSpecifierOnFunctionRedeclaration.ql
@@ -11,6 +11,8 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql b/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql
index 279ad08f3..40bc612de 100644
--- a/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql
+++ b/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M4-10-1/NullUsedAsIntegerValue.ql b/cpp/autosar/src/rules/M4-10-1/NullUsedAsIntegerValue.ql
index 13b49dc48..b9febed7d 100644
--- a/cpp/autosar/src/rules/M4-10-1/NullUsedAsIntegerValue.ql
+++ b/cpp/autosar/src/rules/M4-10-1/NullUsedAsIntegerValue.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M4-10-2/LiteralZeroUsedAsNullPointerConstant.ql b/cpp/autosar/src/rules/M4-10-2/LiteralZeroUsedAsNullPointerConstant.ql
index 2d5a49865..60741e1f8 100644
--- a/cpp/autosar/src/rules/M4-10-2/LiteralZeroUsedAsNullPointerConstant.ql
+++ b/cpp/autosar/src/rules/M4-10-2/LiteralZeroUsedAsNullPointerConstant.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-0-16/PointerAndDerivedPointerAccessDifferentArray.ql b/cpp/autosar/src/rules/M5-0-16/PointerAndDerivedPointerAccessDifferentArray.ql
index a403c6b53..8b6be58cb 100644
--- a/cpp/autosar/src/rules/M5-0-16/PointerAndDerivedPointerAccessDifferentArray.ql
+++ b/cpp/autosar/src/rules/M5-0-16/PointerAndDerivedPointerAccessDifferentArray.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql b/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql
index d6d4f6130..aed9b5827 100644
--- a/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql
+++ b/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-18-1/CommaOperatorUsed.ql b/cpp/autosar/src/rules/M5-18-1/CommaOperatorUsed.ql
index 2ce4319df..f0dc70d12 100644
--- a/cpp/autosar/src/rules/M5-18-1/CommaOperatorUsed.ql
+++ b/cpp/autosar/src/rules/M5-18-1/CommaOperatorUsed.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-19-1/ConstantUnsignedIntegerExpressionsWrapAround.ql b/cpp/autosar/src/rules/M5-19-1/ConstantUnsignedIntegerExpressionsWrapAround.ql
index d5d5490fe..82fcc049d 100644
--- a/cpp/autosar/src/rules/M5-19-1/ConstantUnsignedIntegerExpressionsWrapAround.ql
+++ b/cpp/autosar/src/rules/M5-19-1/ConstantUnsignedIntegerExpressionsWrapAround.ql
@@ -17,6 +17,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql b/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql
index ef9940ff5..b8ec1eeb6 100644
--- a/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql
+++ b/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql
@@ -12,6 +12,8 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-2-11/CommaOperatorAndOperatorAndTheOperatorOverloaded.ql b/cpp/autosar/src/rules/M5-2-11/CommaOperatorAndOperatorAndTheOperatorOverloaded.ql
index ad5d18411..539c71648 100644
--- a/cpp/autosar/src/rules/M5-2-11/CommaOperatorAndOperatorAndTheOperatorOverloaded.ql
+++ b/cpp/autosar/src/rules/M5-2-11/CommaOperatorAndOperatorAndTheOperatorOverloaded.ql
@@ -9,6 +9,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql b/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql
index 086aa40ae..90af2e042 100644
--- a/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql
+++ b/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
index 7017d5e7d..dcbcf163a 100644
--- a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
+++ b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql b/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
index 94f0bc606..efa1fc507 100644
--- a/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
+++ b/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
@@ -9,6 +9,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-2-1/AssignmentInSubExpression.ql b/cpp/autosar/src/rules/M6-2-1/AssignmentInSubExpression.ql
index fb41c3b6b..3c5ac437d 100644
--- a/cpp/autosar/src/rules/M6-2-1/AssignmentInSubExpression.ql
+++ b/cpp/autosar/src/rules/M6-2-1/AssignmentInSubExpression.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-2-2/FloatsTestedForEquality.ql b/cpp/autosar/src/rules/M6-2-2/FloatsTestedForEquality.ql
index 2573c57f2..5a442b3f0 100644
--- a/cpp/autosar/src/rules/M6-2-2/FloatsTestedForEquality.ql
+++ b/cpp/autosar/src/rules/M6-2-2/FloatsTestedForEquality.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql b/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
index b3566a1e2..d541d8de3 100644
--- a/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql b/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
index f550a456d..04df5015e 100644
--- a/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-1/IfCompoundCondition.ql b/cpp/autosar/src/rules/M6-4-1/IfCompoundCondition.ql
index 2f0740e18..10109de97 100644
--- a/cpp/autosar/src/rules/M6-4-1/IfCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-4-1/IfCompoundCondition.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-3/SwitchDoesNotStartWithCase.ql b/cpp/autosar/src/rules/M6-4-3/SwitchDoesNotStartWithCase.ql
index 07953dd9f..c19acc778 100644
--- a/cpp/autosar/src/rules/M6-4-3/SwitchDoesNotStartWithCase.ql
+++ b/cpp/autosar/src/rules/M6-4-3/SwitchDoesNotStartWithCase.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-3/SwitchStatementNotWellFormed.ql b/cpp/autosar/src/rules/M6-4-3/SwitchStatementNotWellFormed.ql
index 24ac2298b..04c1d6b6a 100644
--- a/cpp/autosar/src/rules/M6-4-3/SwitchStatementNotWellFormed.ql
+++ b/cpp/autosar/src/rules/M6-4-3/SwitchStatementNotWellFormed.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-4/NestedCaseInSwitch.ql b/cpp/autosar/src/rules/M6-4-4/NestedCaseInSwitch.ql
index 3b12bf2ef..77c70a9bf 100644
--- a/cpp/autosar/src/rules/M6-4-4/NestedCaseInSwitch.ql
+++ b/cpp/autosar/src/rules/M6-4-4/NestedCaseInSwitch.ql
@@ -11,6 +11,8 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-5/NonEmptySwitchClauseDoesNotTerminate.ql b/cpp/autosar/src/rules/M6-4-5/NonEmptySwitchClauseDoesNotTerminate.ql
index 5dd49dce5..684b9b170 100644
--- a/cpp/autosar/src/rules/M6-4-5/NonEmptySwitchClauseDoesNotTerminate.ql
+++ b/cpp/autosar/src/rules/M6-4-5/NonEmptySwitchClauseDoesNotTerminate.ql
@@ -13,6 +13,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-7/BooleanInSwitchCondition.ql b/cpp/autosar/src/rules/M6-4-7/BooleanInSwitchCondition.ql
index 0f9540ea2..c253c1eeb 100644
--- a/cpp/autosar/src/rules/M6-4-7/BooleanInSwitchCondition.ql
+++ b/cpp/autosar/src/rules/M6-4-7/BooleanInSwitchCondition.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-5-2/NotEqualsInLoopCondition.ql b/cpp/autosar/src/rules/M6-5-2/NotEqualsInLoopCondition.ql
index 8d2071202..f83662ea4 100644
--- a/cpp/autosar/src/rules/M6-5-2/NotEqualsInLoopCondition.ql
+++ b/cpp/autosar/src/rules/M6-5-2/NotEqualsInLoopCondition.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-5-3/LoopCounterModifiedWithinCondition.ql b/cpp/autosar/src/rules/M6-5-3/LoopCounterModifiedWithinCondition.ql
index f97aba1a4..ffb032b26 100644
--- a/cpp/autosar/src/rules/M6-5-3/LoopCounterModifiedWithinCondition.ql
+++ b/cpp/autosar/src/rules/M6-5-3/LoopCounterModifiedWithinCondition.ql
@@ -9,6 +9,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopCondition.ql b/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopCondition.ql
index a8676bf9f..1ee18f2d8 100644
--- a/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopCondition.ql
+++ b/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopCondition.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopExpression.ql b/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopExpression.ql
index f837e5de7..11458704f 100644
--- a/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopExpression.ql
+++ b/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopExpression.ql
@@ -10,6 +10,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-6-1/GotoBlockCondition.ql b/cpp/autosar/src/rules/M6-6-1/GotoBlockCondition.ql
index 84f7a00ba..b308823ec 100644
--- a/cpp/autosar/src/rules/M6-6-1/GotoBlockCondition.ql
+++ b/cpp/autosar/src/rules/M6-6-1/GotoBlockCondition.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-6-2/GotoStatementJumpCondition.ql b/cpp/autosar/src/rules/M6-6-2/GotoStatementJumpCondition.ql
index bde6e8dde..b937f53b9 100644
--- a/cpp/autosar/src/rules/M6-6-2/GotoStatementJumpCondition.ql
+++ b/cpp/autosar/src/rules/M6-6-2/GotoStatementJumpCondition.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql b/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql
index 5a2a1e7b3..427d352c7 100644
--- a/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql
+++ b/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql b/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
index cb5aa9d10..19b00c70a 100644
--- a/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
+++ b/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/non-automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M7-5-2/AssignmentOfEscapingAutoStorage.ql b/cpp/autosar/src/rules/M7-5-2/AssignmentOfEscapingAutoStorage.ql
index 9ebdeb17c..2e3cbada0 100644
--- a/cpp/autosar/src/rules/M7-5-2/AssignmentOfEscapingAutoStorage.ql
+++ b/cpp/autosar/src/rules/M7-5-2/AssignmentOfEscapingAutoStorage.ql
@@ -11,6 +11,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/non-automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
index a0ef5143e..796c531bc 100644
--- a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
+++ b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
@@ -12,6 +12,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql b/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql
index 559b41527..4aeec8470 100644
--- a/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql
+++ b/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql
@@ -14,6 +14,7 @@
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/baseline_suites/codeql-pack.lock.yml b/cpp/baseline_suites/codeql-pack.lock.yml
new file mode 100644
index 000000000..a45ea8f43
--- /dev/null
+++ b/cpp/baseline_suites/codeql-pack.lock.yml
@@ -0,0 +1,24 @@
+---
+lockVersion: 1.0.0
+dependencies:
+  codeql/cpp-all:
+    version: 4.0.3
+  codeql/dataflow:
+    version: 2.0.3
+  codeql/mad:
+    version: 1.0.19
+  codeql/rangeanalysis:
+    version: 1.0.19
+  codeql/ssa:
+    version: 1.0.19
+  codeql/tutorial:
+    version: 1.0.19
+  codeql/typeflow:
+    version: 1.0.19
+  codeql/typetracking:
+    version: 2.0.3
+  codeql/util:
+    version: 2.0.6
+  codeql/xml:
+    version: 1.0.19
+compiled: false
diff --git a/cpp/baseline_suites/codeql-suites/cpp-baseline-default.qls b/cpp/baseline_suites/codeql-suites/cpp-baseline-default.qls
new file mode 100644
index 000000000..ff81bf65e
--- /dev/null
+++ b/cpp/baseline_suites/codeql-suites/cpp-baseline-default.qls
@@ -0,0 +1,17 @@
+- description: C++ Baseline Coding Standards Queries
+- qlpack: codeql/cert-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - coding-standards/baseline/safety
+    - coding-standards/baseline/style
+- qlpack: codeql/autosar-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - coding-standards/baseline/safety
+    - coding-standards/baseline/style
\ No newline at end of file
diff --git a/cpp/baseline_suites/codeql-suites/cpp-baseline-safety.qls b/cpp/baseline_suites/codeql-suites/cpp-baseline-safety.qls
new file mode 100644
index 000000000..b88b28338
--- /dev/null
+++ b/cpp/baseline_suites/codeql-suites/cpp-baseline-safety.qls
@@ -0,0 +1,15 @@
+- description: C++ Baseline Safety Coding Standards Queries
+- qlpack: codeql/cert-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - coding-standards/baseline/safety
+- qlpack: codeql/autosar-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - coding-standards/baseline/safety
\ No newline at end of file
diff --git a/cpp/baseline_suites/codeql-suites/cpp-baseline-style.qls b/cpp/baseline_suites/codeql-suites/cpp-baseline-style.qls
new file mode 100644
index 000000000..2218acb77
--- /dev/null
+++ b/cpp/baseline_suites/codeql-suites/cpp-baseline-style.qls
@@ -0,0 +1,15 @@
+- description: C++ Baseline Style Coding Standards Queries
+- qlpack: codeql/cert-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - coding-standards/baseline/style
+- qlpack: codeql/autosar-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - coding-standards/baseline/style
\ No newline at end of file
diff --git a/cpp/baseline_suites/qlpack.yml b/cpp/baseline_suites/qlpack.yml
new file mode 100644
index 000000000..84933c15b
--- /dev/null
+++ b/cpp/baseline_suites/qlpack.yml
@@ -0,0 +1,10 @@
+name: codeql/coding-standards-cpp-baseline
+version: 2.49.0-dev
+description: A set of baseline coding standards for C++ projects, combining hand picked rules from AUTOSAR and CERT C++.
+suites: codeql-suites
+license: MIT
+default-suite-file: codeql-suites/cpp-baseline-default.qls
+dependencies:
+  codeql/misra-cpp-coding-standards: 2.49.0-dev
+  codeql/cert-cpp-coding-standards: 2.49.0-dev
+  codeql/autosar-cpp-coding-standards: 2.49.0-dev
diff --git a/cpp/cert/src/rules/CON50-CPP/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql b/cpp/cert/src/rules/CON50-CPP/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
index 53f362e27..e96561267 100644
--- a/cpp/cert/src/rules/CON50-CPP/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
+++ b/cpp/cert/src/rules/CON50-CPP/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON50-CPP/DoNotDestroyAMutexWhileItIsLocked.ql b/cpp/cert/src/rules/CON50-CPP/DoNotDestroyAMutexWhileItIsLocked.ql
index c15dfca5f..86e6bdec4 100644
--- a/cpp/cert/src/rules/CON50-CPP/DoNotDestroyAMutexWhileItIsLocked.ql
+++ b/cpp/cert/src/rules/CON50-CPP/DoNotDestroyAMutexWhileItIsLocked.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON51-CPP/EnsureActivelyHeldLocksAreReleasedOnExceptionalConditions.ql b/cpp/cert/src/rules/CON51-CPP/EnsureActivelyHeldLocksAreReleasedOnExceptionalConditions.ql
index ac09d41c4..4386921e9 100644
--- a/cpp/cert/src/rules/CON51-CPP/EnsureActivelyHeldLocksAreReleasedOnExceptionalConditions.ql
+++ b/cpp/cert/src/rules/CON51-CPP/EnsureActivelyHeldLocksAreReleasedOnExceptionalConditions.ql
@@ -16,6 +16,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON52-CPP/PreventBitFieldAccessFromMultipleThreads.ql b/cpp/cert/src/rules/CON52-CPP/PreventBitFieldAccessFromMultipleThreads.ql
index 9ca1a8952..d94f65bce 100644
--- a/cpp/cert/src/rules/CON52-CPP/PreventBitFieldAccessFromMultipleThreads.ql
+++ b/cpp/cert/src/rules/CON52-CPP/PreventBitFieldAccessFromMultipleThreads.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p8
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON53-CPP/DeadlockByLockingInPredefinedOrder.ql b/cpp/cert/src/rules/CON53-CPP/DeadlockByLockingInPredefinedOrder.ql
index d83b3d520..bb89d0c68 100644
--- a/cpp/cert/src/rules/CON53-CPP/DeadlockByLockingInPredefinedOrder.ql
+++ b/cpp/cert/src/rules/CON53-CPP/DeadlockByLockingInPredefinedOrder.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON54-CPP/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql b/cpp/cert/src/rules/CON54-CPP/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
index 84255dbfc..a4fa80f52 100644
--- a/cpp/cert/src/rules/CON54-CPP/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
+++ b/cpp/cert/src/rules/CON54-CPP/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON55-CPP/PreserveSafetyWhenUsingConditionVariables.ql b/cpp/cert/src/rules/CON55-CPP/PreserveSafetyWhenUsingConditionVariables.ql
index d4f43c7d0..bdb3b997c 100644
--- a/cpp/cert/src/rules/CON55-CPP/PreserveSafetyWhenUsingConditionVariables.ql
+++ b/cpp/cert/src/rules/CON55-CPP/PreserveSafetyWhenUsingConditionVariables.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR51-CPP/UsesValidContainerElementAccess.ql b/cpp/cert/src/rules/CTR51-CPP/UsesValidContainerElementAccess.ql
index 0652f065c..4e8afd6e7 100644
--- a/cpp/cert/src/rules/CTR51-CPP/UsesValidContainerElementAccess.ql
+++ b/cpp/cert/src/rules/CTR51-CPP/UsesValidContainerElementAccess.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql b/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql
index b02286913..f119e8964 100644
--- a/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql
+++ b/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR53-CPP/UseValidIteratorRanges.ql b/cpp/cert/src/rules/CTR53-CPP/UseValidIteratorRanges.ql
index 1512a7fd9..cd6a9444b 100644
--- a/cpp/cert/src/rules/CTR53-CPP/UseValidIteratorRanges.ql
+++ b/cpp/cert/src/rules/CTR53-CPP/UseValidIteratorRanges.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR54-CPP/DoNotSubtractIteratorsForDifferentContainers.ql b/cpp/cert/src/rules/CTR54-CPP/DoNotSubtractIteratorsForDifferentContainers.ql
index 2401bcbf5..2b156b1c6 100644
--- a/cpp/cert/src/rules/CTR54-CPP/DoNotSubtractIteratorsForDifferentContainers.ql
+++ b/cpp/cert/src/rules/CTR54-CPP/DoNotSubtractIteratorsForDifferentContainers.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p8
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.ql b/cpp/cert/src/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.ql
index c6ea2c451..74f235e88 100644
--- a/cpp/cert/src/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.ql
+++ b/cpp/cert/src/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql b/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql
index b4ac26722..e8db5e698 100644
--- a/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql
+++ b/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p9
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL50-CPP/DoNotDefineACStyleVariadicFunction.ql b/cpp/cert/src/rules/DCL50-CPP/DoNotDefineACStyleVariadicFunction.ql
index b24988823..b1e5e4d02 100644
--- a/cpp/cert/src/rules/DCL50-CPP/DoNotDefineACStyleVariadicFunction.ql
+++ b/cpp/cert/src/rules/DCL50-CPP/DoNotDefineACStyleVariadicFunction.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p12
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql b/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql
index f576144c4..730a8f9f7 100644
--- a/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql
+++ b/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql
@@ -15,6 +15,8 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql b/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql
index 45aa70dc3..c575644bb 100644
--- a/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql
+++ b/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL54-CPP/SingularOverloadOfMemoryFunction.ql b/cpp/cert/src/rules/DCL54-CPP/SingularOverloadOfMemoryFunction.ql
index 8f168e90c..dcb0bd844 100644
--- a/cpp/cert/src/rules/DCL54-CPP/SingularOverloadOfMemoryFunction.ql
+++ b/cpp/cert/src/rules/DCL54-CPP/SingularOverloadOfMemoryFunction.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL56-CPP/CyclesDuringStaticObjectInit.ql b/cpp/cert/src/rules/DCL56-CPP/CyclesDuringStaticObjectInit.ql
index 4eb94f3d1..f55a8aa40 100644
--- a/cpp/cert/src/rules/DCL56-CPP/CyclesDuringStaticObjectInit.ql
+++ b/cpp/cert/src/rules/DCL56-CPP/CyclesDuringStaticObjectInit.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL57-CPP/DoNotLetExceptionsEscapeFromDestructorsOrDeallocationFunctions.ql b/cpp/cert/src/rules/DCL57-CPP/DoNotLetExceptionsEscapeFromDestructorsOrDeallocationFunctions.ql
index 6f625fd30..fbe7c343d 100644
--- a/cpp/cert/src/rules/DCL57-CPP/DoNotLetExceptionsEscapeFromDestructorsOrDeallocationFunctions.ql
+++ b/cpp/cert/src/rules/DCL57-CPP/DoNotLetExceptionsEscapeFromDestructorsOrDeallocationFunctions.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL58-CPP/ModificationOfTheStandardNamespaces.ql b/cpp/cert/src/rules/DCL58-CPP/ModificationOfTheStandardNamespaces.ql
index 81242bc0f..7d7a9e385 100644
--- a/cpp/cert/src/rules/DCL58-CPP/ModificationOfTheStandardNamespaces.ql
+++ b/cpp/cert/src/rules/DCL58-CPP/ModificationOfTheStandardNamespaces.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL59-CPP/UnnamedNamespaceInHeaderFile.ql b/cpp/cert/src/rules/DCL59-CPP/UnnamedNamespaceInHeaderFile.ql
index 2b8b364c7..a84c93cb3 100644
--- a/cpp/cert/src/rules/DCL59-CPP/UnnamedNamespaceInHeaderFile.ql
+++ b/cpp/cert/src/rules/DCL59-CPP/UnnamedNamespaceInHeaderFile.ql
@@ -16,6 +16,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR50-CPP/ExitHandlerThrowsExceptionCert.ql b/cpp/cert/src/rules/ERR50-CPP/ExitHandlerThrowsExceptionCert.ql
index 548b7b4b9..c4e5ff63e 100644
--- a/cpp/cert/src/rules/ERR50-CPP/ExitHandlerThrowsExceptionCert.ql
+++ b/cpp/cert/src/rules/ERR50-CPP/ExitHandlerThrowsExceptionCert.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR50-CPP/ExplicitAbruptTerminationCert.ql b/cpp/cert/src/rules/ERR50-CPP/ExplicitAbruptTerminationCert.ql
index 4fe89c634..1c723fd7a 100644
--- a/cpp/cert/src/rules/ERR50-CPP/ExplicitAbruptTerminationCert.ql
+++ b/cpp/cert/src/rules/ERR50-CPP/ExplicitAbruptTerminationCert.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR50-CPP/RethrowNestedWithoutCaptureCert.ql b/cpp/cert/src/rules/ERR50-CPP/RethrowNestedWithoutCaptureCert.ql
index 05d04de99..ebef7de1c 100644
--- a/cpp/cert/src/rules/ERR50-CPP/RethrowNestedWithoutCaptureCert.ql
+++ b/cpp/cert/src/rules/ERR50-CPP/RethrowNestedWithoutCaptureCert.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR51-CPP/HandleAllExceptions.ql b/cpp/cert/src/rules/ERR51-CPP/HandleAllExceptions.ql
index f8447d4af..b822cfdce 100644
--- a/cpp/cert/src/rules/ERR51-CPP/HandleAllExceptions.ql
+++ b/cpp/cert/src/rules/ERR51-CPP/HandleAllExceptions.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql b/cpp/cert/src/rules/ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql
index 6c9cb2e43..3e4430a17 100644
--- a/cpp/cert/src/rules/ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql
+++ b/cpp/cert/src/rules/ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql
@@ -14,6 +14,8 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR53-CPP/DestroyedValueReferencedInConstructorDestructorCatchBlock.ql b/cpp/cert/src/rules/ERR53-CPP/DestroyedValueReferencedInConstructorDestructorCatchBlock.ql
index 8587a73c3..b80f9b17f 100644
--- a/cpp/cert/src/rules/ERR53-CPP/DestroyedValueReferencedInConstructorDestructorCatchBlock.ql
+++ b/cpp/cert/src/rules/ERR53-CPP/DestroyedValueReferencedInConstructorDestructorCatchBlock.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR54-CPP/CatchBlockShadowingCert.ql b/cpp/cert/src/rules/ERR54-CPP/CatchBlockShadowingCert.ql
index c3e0aeb2f..143c3b9a6 100644
--- a/cpp/cert/src/rules/ERR54-CPP/CatchBlockShadowingCert.ql
+++ b/cpp/cert/src/rules/ERR54-CPP/CatchBlockShadowingCert.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR56-CPP/GuaranteeExceptionSafety.ql b/cpp/cert/src/rules/ERR56-CPP/GuaranteeExceptionSafety.ql
index 5831a7f40..13208d694 100644
--- a/cpp/cert/src/rules/ERR56-CPP/GuaranteeExceptionSafety.ql
+++ b/cpp/cert/src/rules/ERR56-CPP/GuaranteeExceptionSafety.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p9
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR57-CPP/DoNotLeakResourcesWhenHandlingExceptions.ql b/cpp/cert/src/rules/ERR57-CPP/DoNotLeakResourcesWhenHandlingExceptions.ql
index 6180bf2f8..6cd55e3a8 100644
--- a/cpp/cert/src/rules/ERR57-CPP/DoNotLeakResourcesWhenHandlingExceptions.ql
+++ b/cpp/cert/src/rules/ERR57-CPP/DoNotLeakResourcesWhenHandlingExceptions.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR60-CPP/ExceptionObjectsMustBeNothrowCopyConstructible.ql b/cpp/cert/src/rules/ERR60-CPP/ExceptionObjectsMustBeNothrowCopyConstructible.ql
index 61a145c7a..3ab5918dc 100644
--- a/cpp/cert/src/rules/ERR60-CPP/ExceptionObjectsMustBeNothrowCopyConstructible.ql
+++ b/cpp/cert/src/rules/ERR60-CPP/ExceptionObjectsMustBeNothrowCopyConstructible.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR61-CPP/CatchExceptionsByLvalueReference.ql b/cpp/cert/src/rules/ERR61-CPP/CatchExceptionsByLvalueReference.ql
index 8cc9c4785..dcff5dc25 100644
--- a/cpp/cert/src/rules/ERR61-CPP/CatchExceptionsByLvalueReference.ql
+++ b/cpp/cert/src/rules/ERR61-CPP/CatchExceptionsByLvalueReference.ql
@@ -14,6 +14,8 @@
  *       external/cert/priority/p3
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR62-CPP/DetectErrorsWhenConvertingAStringToANumber.ql b/cpp/cert/src/rules/ERR62-CPP/DetectErrorsWhenConvertingAStringToANumber.ql
index e5451a0fc..fdd2e9848 100644
--- a/cpp/cert/src/rules/ERR62-CPP/DetectErrorsWhenConvertingAStringToANumber.ql
+++ b/cpp/cert/src/rules/ERR62-CPP/DetectErrorsWhenConvertingAStringToANumber.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql b/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql
index d0935cc79..417a384ce 100644
--- a/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql
+++ b/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP53-CPP/DoNotReadUninitializedMemory.ql b/cpp/cert/src/rules/EXP53-CPP/DoNotReadUninitializedMemory.ql
index 9839fae0f..7dfd2b6e7 100644
--- a/cpp/cert/src/rules/EXP53-CPP/DoNotReadUninitializedMemory.ql
+++ b/cpp/cert/src/rules/EXP53-CPP/DoNotReadUninitializedMemory.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p12
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedAfterLifetimeCert.ql b/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedAfterLifetimeCert.ql
index 534bb8379..9c71c89ad 100644
--- a/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedAfterLifetimeCert.ql
+++ b/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedAfterLifetimeCert.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedBeforeLifetimeCert.ql b/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedBeforeLifetimeCert.ql
index ea2349194..ebea7372b 100644
--- a/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedBeforeLifetimeCert.ql
+++ b/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedBeforeLifetimeCert.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP57-CPP/DeletingPointerToIncompleteClass.ql b/cpp/cert/src/rules/EXP57-CPP/DeletingPointerToIncompleteClass.ql
index 935218f78..9c89c42fd 100644
--- a/cpp/cert/src/rules/EXP57-CPP/DeletingPointerToIncompleteClass.ql
+++ b/cpp/cert/src/rules/EXP57-CPP/DeletingPointerToIncompleteClass.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP58-CPP/PassNonTrivialObjectToVaStart.ql b/cpp/cert/src/rules/EXP58-CPP/PassNonTrivialObjectToVaStart.ql
index b537fa34c..d5ffa6c63 100644
--- a/cpp/cert/src/rules/EXP58-CPP/PassNonTrivialObjectToVaStart.ql
+++ b/cpp/cert/src/rules/EXP58-CPP/PassNonTrivialObjectToVaStart.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP58-CPP/PassPromotablePrimitiveTypeToVaStart.ql b/cpp/cert/src/rules/EXP58-CPP/PassPromotablePrimitiveTypeToVaStart.ql
index 1d3468026..1f2662c8c 100644
--- a/cpp/cert/src/rules/EXP58-CPP/PassPromotablePrimitiveTypeToVaStart.ql
+++ b/cpp/cert/src/rules/EXP58-CPP/PassPromotablePrimitiveTypeToVaStart.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP58-CPP/PassReferenceTypeToVaStart.ql b/cpp/cert/src/rules/EXP58-CPP/PassReferenceTypeToVaStart.ql
index ce340d63c..c510ce074 100644
--- a/cpp/cert/src/rules/EXP58-CPP/PassReferenceTypeToVaStart.ql
+++ b/cpp/cert/src/rules/EXP58-CPP/PassReferenceTypeToVaStart.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP61-CPP/EscapingLambdaObjectWithCaptureByReference.ql b/cpp/cert/src/rules/EXP61-CPP/EscapingLambdaObjectWithCaptureByReference.ql
index 1268d1c82..b8e7b0de1 100644
--- a/cpp/cert/src/rules/EXP61-CPP/EscapingLambdaObjectWithCaptureByReference.ql
+++ b/cpp/cert/src/rules/EXP61-CPP/EscapingLambdaObjectWithCaptureByReference.ql
@@ -16,6 +16,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP61-CPP/ReturningLambdaObjectWithCaptureByReference.ql b/cpp/cert/src/rules/EXP61-CPP/ReturningLambdaObjectWithCaptureByReference.ql
index eb76ba618..2bf272a73 100644
--- a/cpp/cert/src/rules/EXP61-CPP/ReturningLambdaObjectWithCaptureByReference.ql
+++ b/cpp/cert/src/rules/EXP61-CPP/ReturningLambdaObjectWithCaptureByReference.ql
@@ -16,6 +16,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP62-CPP/MemcmpUsedToAccessObjectRepresentation.ql b/cpp/cert/src/rules/EXP62-CPP/MemcmpUsedToAccessObjectRepresentation.ql
index 64bfb4673..695eb7fd1 100644
--- a/cpp/cert/src/rules/EXP62-CPP/MemcmpUsedToAccessObjectRepresentation.ql
+++ b/cpp/cert/src/rules/EXP62-CPP/MemcmpUsedToAccessObjectRepresentation.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP62-CPP/MemcpyUsedToAccessObjectRepresentation.ql b/cpp/cert/src/rules/EXP62-CPP/MemcpyUsedToAccessObjectRepresentation.ql
index 0e8847257..307e0419c 100644
--- a/cpp/cert/src/rules/EXP62-CPP/MemcpyUsedToAccessObjectRepresentation.ql
+++ b/cpp/cert/src/rules/EXP62-CPP/MemcpyUsedToAccessObjectRepresentation.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP62-CPP/MemsetUsedToAccessObjectRepresentation.ql b/cpp/cert/src/rules/EXP62-CPP/MemsetUsedToAccessObjectRepresentation.ql
index a4ae63528..20f25909a 100644
--- a/cpp/cert/src/rules/EXP62-CPP/MemsetUsedToAccessObjectRepresentation.ql
+++ b/cpp/cert/src/rules/EXP62-CPP/MemsetUsedToAccessObjectRepresentation.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP63-CPP/DoNotRelyOnTheValueOfAMovedFromObject.ql b/cpp/cert/src/rules/EXP63-CPP/DoNotRelyOnTheValueOfAMovedFromObject.ql
index 48e534bfb..7c878528a 100644
--- a/cpp/cert/src/rules/EXP63-CPP/DoNotRelyOnTheValueOfAMovedFromObject.ql
+++ b/cpp/cert/src/rules/EXP63-CPP/DoNotRelyOnTheValueOfAMovedFromObject.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p8
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/FIO50-CPP/InterleavedInputOutputWithoutPosition.ql b/cpp/cert/src/rules/FIO50-CPP/InterleavedInputOutputWithoutPosition.ql
index 0333955f7..e645a5630 100644
--- a/cpp/cert/src/rules/FIO50-CPP/InterleavedInputOutputWithoutPosition.ql
+++ b/cpp/cert/src/rules/FIO50-CPP/InterleavedInputOutputWithoutPosition.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/FIO51-CPP/CloseFilesWhenTheyAreNoLongerNeeded.ql b/cpp/cert/src/rules/FIO51-CPP/CloseFilesWhenTheyAreNoLongerNeeded.ql
index a44469259..0634f376a 100644
--- a/cpp/cert/src/rules/FIO51-CPP/CloseFilesWhenTheyAreNoLongerNeeded.ql
+++ b/cpp/cert/src/rules/FIO51-CPP/CloseFilesWhenTheyAreNoLongerNeeded.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM50-CPP/UseAfterFree.ql b/cpp/cert/src/rules/MEM50-CPP/UseAfterFree.ql
index 8c31fc104..1ff132e76 100644
--- a/cpp/cert/src/rules/MEM50-CPP/UseAfterFree.ql
+++ b/cpp/cert/src/rules/MEM50-CPP/UseAfterFree.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM51-CPP/ProperlyDeallocateDynamicallyAllocatedResources.ql b/cpp/cert/src/rules/MEM51-CPP/ProperlyDeallocateDynamicallyAllocatedResources.ql
index 70fd363c6..356e3d0ff 100644
--- a/cpp/cert/src/rules/MEM51-CPP/ProperlyDeallocateDynamicallyAllocatedResources.ql
+++ b/cpp/cert/src/rules/MEM51-CPP/ProperlyDeallocateDynamicallyAllocatedResources.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql b/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql
index 90685f1c9..d4c1c188d 100644
--- a/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql
+++ b/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql b/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql
index fe6fff2d4..f0769fc60 100644
--- a/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql
+++ b/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM54-CPP/PlacementNewInsufficientStorageCert.ql b/cpp/cert/src/rules/MEM54-CPP/PlacementNewInsufficientStorageCert.ql
index fca919055..706d39179 100644
--- a/cpp/cert/src/rules/MEM54-CPP/PlacementNewInsufficientStorageCert.ql
+++ b/cpp/cert/src/rules/MEM54-CPP/PlacementNewInsufficientStorageCert.ql
@@ -16,6 +16,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM54-CPP/PlacementNewNotProperlyAlignedCert.ql b/cpp/cert/src/rules/MEM54-CPP/PlacementNewNotProperlyAlignedCert.ql
index d623e85a5..26ca448a7 100644
--- a/cpp/cert/src/rules/MEM54-CPP/PlacementNewNotProperlyAlignedCert.ql
+++ b/cpp/cert/src/rules/MEM54-CPP/PlacementNewNotProperlyAlignedCert.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM55-CPP/OperatorDeleteMissingPartnerCert.ql b/cpp/cert/src/rules/MEM55-CPP/OperatorDeleteMissingPartnerCert.ql
index fd8f4f3a0..076c2bd60 100644
--- a/cpp/cert/src/rules/MEM55-CPP/OperatorDeleteMissingPartnerCert.ql
+++ b/cpp/cert/src/rules/MEM55-CPP/OperatorDeleteMissingPartnerCert.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM55-CPP/ThrowingNoThrowOperatorNewDeleteCert.ql b/cpp/cert/src/rules/MEM55-CPP/ThrowingNoThrowOperatorNewDeleteCert.ql
index 2740498ee..ba8f100b4 100644
--- a/cpp/cert/src/rules/MEM55-CPP/ThrowingNoThrowOperatorNewDeleteCert.ql
+++ b/cpp/cert/src/rules/MEM55-CPP/ThrowingNoThrowOperatorNewDeleteCert.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewReturnsNullCert.ql b/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewReturnsNullCert.ql
index 072c69201..7f09dc7c8 100644
--- a/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewReturnsNullCert.ql
+++ b/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewReturnsNullCert.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewThrowsInvalidExceptionCert.ql b/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewThrowsInvalidExceptionCert.ql
index da4b63200..401806277 100644
--- a/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewThrowsInvalidExceptionCert.ql
+++ b/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewThrowsInvalidExceptionCert.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM57-CPP/UsingDefaultOperatorNewForOverAlignedTypes.ql b/cpp/cert/src/rules/MEM57-CPP/UsingDefaultOperatorNewForOverAlignedTypes.ql
index 6c3d18c27..510f89842 100644
--- a/cpp/cert/src/rules/MEM57-CPP/UsingDefaultOperatorNewForOverAlignedTypes.ql
+++ b/cpp/cert/src/rules/MEM57-CPP/UsingDefaultOperatorNewForOverAlignedTypes.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MSC50-CPP/DoNotUseRandForGeneratingPseudorandomNumbers.ql b/cpp/cert/src/rules/MSC50-CPP/DoNotUseRandForGeneratingPseudorandomNumbers.ql
index b67cec99f..eacf22812 100644
--- a/cpp/cert/src/rules/MSC50-CPP/DoNotUseRandForGeneratingPseudorandomNumbers.ql
+++ b/cpp/cert/src/rules/MSC50-CPP/DoNotUseRandForGeneratingPseudorandomNumbers.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql b/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql
index 5322fbbde..ae8562e59 100644
--- a/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql
+++ b/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MSC52-CPP/NonVoidFunctionDoesNotReturnCert.ql b/cpp/cert/src/rules/MSC52-CPP/NonVoidFunctionDoesNotReturnCert.ql
index dcf42a78f..ef850a17e 100644
--- a/cpp/cert/src/rules/MSC52-CPP/NonVoidFunctionDoesNotReturnCert.ql
+++ b/cpp/cert/src/rules/MSC52-CPP/NonVoidFunctionDoesNotReturnCert.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p8
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MSC53-CPP/FunctionNoReturnAttributeConditionCert.ql b/cpp/cert/src/rules/MSC53-CPP/FunctionNoReturnAttributeConditionCert.ql
index 5044b3b42..c4ddcc459 100644
--- a/cpp/cert/src/rules/MSC53-CPP/FunctionNoReturnAttributeConditionCert.ql
+++ b/cpp/cert/src/rules/MSC53-CPP/FunctionNoReturnAttributeConditionCert.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MSC54-CPP/SignalHandlerMustBeAPlainOldFunction.ql b/cpp/cert/src/rules/MSC54-CPP/SignalHandlerMustBeAPlainOldFunction.ql
index 885d8caa0..d5962ca61 100644
--- a/cpp/cert/src/rules/MSC54-CPP/SignalHandlerMustBeAPlainOldFunction.ql
+++ b/cpp/cert/src/rules/MSC54-CPP/SignalHandlerMustBeAPlainOldFunction.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP50-CPP/DoNotInvokeVirtualFunctionsFromConstructorsOrDestructors.ql b/cpp/cert/src/rules/OOP50-CPP/DoNotInvokeVirtualFunctionsFromConstructorsOrDestructors.ql
index 1c3df97cf..cfa4b9c33 100644
--- a/cpp/cert/src/rules/OOP50-CPP/DoNotInvokeVirtualFunctionsFromConstructorsOrDestructors.ql
+++ b/cpp/cert/src/rules/OOP50-CPP/DoNotInvokeVirtualFunctionsFromConstructorsOrDestructors.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP51-CPP/DoNotSliceDerivedObjects.ql b/cpp/cert/src/rules/OOP51-CPP/DoNotSliceDerivedObjects.ql
index 4cb654730..ace00e591 100644
--- a/cpp/cert/src/rules/OOP51-CPP/DoNotSliceDerivedObjects.ql
+++ b/cpp/cert/src/rules/OOP51-CPP/DoNotSliceDerivedObjects.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP52-CPP/DoNotDeleteAPolymorphicObjectWithoutAVirtualDestructor.ql b/cpp/cert/src/rules/OOP52-CPP/DoNotDeleteAPolymorphicObjectWithoutAVirtualDestructor.ql
index 190c4d720..92597beae 100644
--- a/cpp/cert/src/rules/OOP52-CPP/DoNotDeleteAPolymorphicObjectWithoutAVirtualDestructor.ql
+++ b/cpp/cert/src/rules/OOP52-CPP/DoNotDeleteAPolymorphicObjectWithoutAVirtualDestructor.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p9
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP53-CPP/UseCanonicalOrderForMemberInit.ql b/cpp/cert/src/rules/OOP53-CPP/UseCanonicalOrderForMemberInit.ql
index b42b54ef6..57eaac45e 100644
--- a/cpp/cert/src/rules/OOP53-CPP/UseCanonicalOrderForMemberInit.ql
+++ b/cpp/cert/src/rules/OOP53-CPP/UseCanonicalOrderForMemberInit.ql
@@ -18,6 +18,7 @@
  *       external/cert/priority/p4
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP54-CPP/GracefullyHandleSelfCopyAssignment.ql b/cpp/cert/src/rules/OOP54-CPP/GracefullyHandleSelfCopyAssignment.ql
index 844d0f54b..051c397b0 100644
--- a/cpp/cert/src/rules/OOP54-CPP/GracefullyHandleSelfCopyAssignment.ql
+++ b/cpp/cert/src/rules/OOP54-CPP/GracefullyHandleSelfCopyAssignment.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP55-CPP/MemberAccessWithUninitializedStaticPointerToMember.ql b/cpp/cert/src/rules/OOP55-CPP/MemberAccessWithUninitializedStaticPointerToMember.ql
index 27c63c2c1..99c7276ba 100644
--- a/cpp/cert/src/rules/OOP55-CPP/MemberAccessWithUninitializedStaticPointerToMember.ql
+++ b/cpp/cert/src/rules/OOP55-CPP/MemberAccessWithUninitializedStaticPointerToMember.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessNonexistentMember.ql b/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessNonexistentMember.ql
index 72d640f29..c9951e5fb 100644
--- a/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessNonexistentMember.ql
+++ b/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessNonexistentMember.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessUndefinedMember.ql b/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessUndefinedMember.ql
index 202123c11..049dcf7c1 100644
--- a/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessUndefinedMember.ql
+++ b/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessUndefinedMember.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP56-CPP/HonorNewReplacementHandlerRequirements.ql b/cpp/cert/src/rules/OOP56-CPP/HonorNewReplacementHandlerRequirements.ql
index 981bd1ce5..5f436baf5 100644
--- a/cpp/cert/src/rules/OOP56-CPP/HonorNewReplacementHandlerRequirements.ql
+++ b/cpp/cert/src/rules/OOP56-CPP/HonorNewReplacementHandlerRequirements.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP56-CPP/HonorTerminationReplacementHandlerRequirements.ql b/cpp/cert/src/rules/OOP56-CPP/HonorTerminationReplacementHandlerRequirements.ql
index 4d59b36b5..c1f83a11a 100644
--- a/cpp/cert/src/rules/OOP56-CPP/HonorTerminationReplacementHandlerRequirements.ql
+++ b/cpp/cert/src/rules/OOP56-CPP/HonorTerminationReplacementHandlerRequirements.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p2
  *       external/cert/level/l3
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP57-CPP/PreferSpecialMemberFunctionsAndOverloadedOperatorsToCStandardLibraryFunctions.ql b/cpp/cert/src/rules/OOP57-CPP/PreferSpecialMemberFunctionsAndOverloadedOperatorsToCStandardLibraryFunctions.ql
index 9ac17e84a..edaeef9b1 100644
--- a/cpp/cert/src/rules/OOP57-CPP/PreferSpecialMemberFunctionsAndOverloadedOperatorsToCStandardLibraryFunctions.ql
+++ b/cpp/cert/src/rules/OOP57-CPP/PreferSpecialMemberFunctionsAndOverloadedOperatorsToCStandardLibraryFunctions.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP58-CPP/CopyOperationsMustNotMutateTheSourceObject.ql b/cpp/cert/src/rules/OOP58-CPP/CopyOperationsMustNotMutateTheSourceObject.ql
index 9ad059370..454ede157 100644
--- a/cpp/cert/src/rules/OOP58-CPP/CopyOperationsMustNotMutateTheSourceObject.ql
+++ b/cpp/cert/src/rules/OOP58-CPP/CopyOperationsMustNotMutateTheSourceObject.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p9
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/STR50-CPP/BasicStringMayNotBeNullTerminatedCert.ql b/cpp/cert/src/rules/STR50-CPP/BasicStringMayNotBeNullTerminatedCert.ql
index 2cd08be70..41de6d7ae 100644
--- a/cpp/cert/src/rules/STR50-CPP/BasicStringMayNotBeNullTerminatedCert.ql
+++ b/cpp/cert/src/rules/STR50-CPP/BasicStringMayNotBeNullTerminatedCert.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/STR50-CPP/OperationMayNotNullTerminateCStyleStringCert.ql b/cpp/cert/src/rules/STR50-CPP/OperationMayNotNullTerminateCStyleStringCert.ql
index 59f56207c..9c2b4e4c0 100644
--- a/cpp/cert/src/rules/STR50-CPP/OperationMayNotNullTerminateCStyleStringCert.ql
+++ b/cpp/cert/src/rules/STR50-CPP/OperationMayNotNullTerminateCStyleStringCert.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/STR51-CPP/DoNotAttemptToCreateAStringFromANullPointer.ql b/cpp/cert/src/rules/STR51-CPP/DoNotAttemptToCreateAStringFromANullPointer.ql
index a6337e2fc..984298779 100644
--- a/cpp/cert/src/rules/STR51-CPP/DoNotAttemptToCreateAStringFromANullPointer.ql
+++ b/cpp/cert/src/rules/STR51-CPP/DoNotAttemptToCreateAStringFromANullPointer.ql
@@ -13,6 +13,7 @@
  *       external/cert/priority/p18
  *       external/cert/level/l1
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/STR52-CPP/UseValidReferencesForElementsOfString.ql b/cpp/cert/src/rules/STR52-CPP/UseValidReferencesForElementsOfString.ql
index 21c29f54e..6805fd956 100644
--- a/cpp/cert/src/rules/STR52-CPP/UseValidReferencesForElementsOfString.ql
+++ b/cpp/cert/src/rules/STR52-CPP/UseValidReferencesForElementsOfString.ql
@@ -14,6 +14,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/STR53-CPP/RangeCheckStringElementAccess.ql b/cpp/cert/src/rules/STR53-CPP/RangeCheckStringElementAccess.ql
index c92f2b231..964adba12 100644
--- a/cpp/cert/src/rules/STR53-CPP/RangeCheckStringElementAccess.ql
+++ b/cpp/cert/src/rules/STR53-CPP/RangeCheckStringElementAccess.ql
@@ -15,6 +15,7 @@
  *       external/cert/priority/p6
  *       external/cert/level/l2
  *       external/cert/obligation/rule
+ *       coding-standards/baseline/safety
  */
 
 import cpp

From 9aea0c68ac1208df3019315291cd99b2a21c0310 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 5 Nov 2025 13:32:40 -0800
Subject: [PATCH 02/10] Move baseline packs to advanced-security org, update
 versions.

---
 c/baseline_suites/qlpack.yml   |  8 ++++----
 cpp/baseline_suites/qlpack.yml | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/c/baseline_suites/qlpack.yml b/c/baseline_suites/qlpack.yml
index 982fa6814..806e62f20 100644
--- a/c/baseline_suites/qlpack.yml
+++ b/c/baseline_suites/qlpack.yml
@@ -1,9 +1,9 @@
-name: codeql/coding-standards-c-baseline
-version: 2.49.0-dev
+name: advanced-security/coding-standards-c-baseline
+version: 0.0.2
 description: A set of baseline coding standards for C projects, combining hand picked rules from MISRA C and CERT C.
 suites: codeql-suites
 license: MIT
 default-suite-file: codeql-suites/c-baseline-default.qls
 dependencies:
-  codeql/misra-c-coding-standards: 2.49.0-dev
-  codeql/cert-c-coding-standards: 2.49.0-dev
+  codeql/misra-c-coding-standards: 2.51.0
+  codeql/cert-c-coding-standards: 2.51.0
diff --git a/cpp/baseline_suites/qlpack.yml b/cpp/baseline_suites/qlpack.yml
index 84933c15b..daa388417 100644
--- a/cpp/baseline_suites/qlpack.yml
+++ b/cpp/baseline_suites/qlpack.yml
@@ -1,10 +1,10 @@
-name: codeql/coding-standards-cpp-baseline
-version: 2.49.0-dev
+name: advanced-security/coding-standards-cpp-baseline
+version: 0.0.1
 description: A set of baseline coding standards for C++ projects, combining hand picked rules from AUTOSAR and CERT C++.
 suites: codeql-suites
 license: MIT
 default-suite-file: codeql-suites/cpp-baseline-default.qls
 dependencies:
-  codeql/misra-cpp-coding-standards: 2.49.0-dev
-  codeql/cert-cpp-coding-standards: 2.49.0-dev
-  codeql/autosar-cpp-coding-standards: 2.49.0-dev
+  codeql/misra-cpp-coding-standards: 2.51.0
+  codeql/cert-cpp-coding-standards: 2.51.0
+  codeql/autosar-cpp-coding-standards: 2.51.0

From 9f60ba3382bc4cce32e244cc6f8b198c89f2d0b1 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 4 Dec 2025 14:42:40 -0800
Subject: [PATCH 03/10] Add baseline tags to rule package json files.

---
 rule_packages/c/Alignment.json                | 14 +++--
 rule_packages/c/Banned.json                   | 13 ++--
 rule_packages/c/Banned2.json                  |  3 +-
 rule_packages/c/BitfieldTypes.json            |  3 +-
 rule_packages/c/BitfieldTypes2.json           |  3 +-
 rule_packages/c/Concurrency1.json             |  6 +-
 rule_packages/c/Concurrency2.json             |  3 +-
 rule_packages/c/Concurrency3.json             | 12 ++--
 rule_packages/c/Concurrency4.json             |  3 +-
 rule_packages/c/Concurrency5.json             |  6 +-
 rule_packages/c/Concurrency6.json             |  9 ++-
 rule_packages/c/Concurrency7.json             |  6 +-
 rule_packages/c/Concurrency8.json             | 18 ++++--
 rule_packages/c/Concurrency9.json             | 21 ++++---
 rule_packages/c/Contracts.json                |  3 +-
 rule_packages/c/Contracts1.json               |  6 +-
 rule_packages/c/Contracts2.json               | 18 ++++--
 rule_packages/c/Contracts3.json               |  9 ++-
 rule_packages/c/Contracts4.json               | 12 ++--
 rule_packages/c/Contracts5.json               |  3 +-
 rule_packages/c/Contracts6.json               |  6 +-
 rule_packages/c/Contracts7.json               | 12 ++--
 rule_packages/c/DeadCode.json                 | 15 +++--
 rule_packages/c/DeadCode2.json                |  3 +-
 rule_packages/c/Declarations1.json            |  7 ++-
 rule_packages/c/Declarations2.json            |  6 +-
 rule_packages/c/Declarations3.json            |  3 +-
 rule_packages/c/Declarations4.json            |  3 +-
 rule_packages/c/Declarations5.json            | 11 +++-
 rule_packages/c/Declarations6.json            | 14 +++--
 rule_packages/c/Declarations7.json            |  8 ++-
 rule_packages/c/Declarations8.json            |  6 +-
 rule_packages/c/Declarations9.json            |  3 +-
 rule_packages/c/EssentialTypes.json           |  6 +-
 rule_packages/c/EssentialTypes2.json          |  3 +-
 rule_packages/c/Expressions.json              | 12 ++--
 rule_packages/c/FloatingTypes.json            |  3 +-
 rule_packages/c/Generics.json                 | 23 ++++---
 rule_packages/c/IO1.json                      | 12 ++--
 rule_packages/c/IO2.json                      |  9 ++-
 rule_packages/c/IO3.json                      | 15 +++--
 rule_packages/c/IO4.json                      | 12 ++--
 rule_packages/c/IntegerOverflow.json          |  6 +-
 rule_packages/c/InvalidMemory1.json           |  6 +-
 rule_packages/c/InvalidMemory2.json           |  6 +-
 rule_packages/c/InvalidMemory3.json           |  9 ++-
 rule_packages/c/Language4.json                | 36 ++++++++---
 rule_packages/c/Memory1.json                  |  9 ++-
 rule_packages/c/Memory2.json                  | 24 ++++---
 rule_packages/c/Misc.json                     |  6 +-
 rule_packages/c/NoReturn.json                 |  6 +-
 rule_packages/c/OutOfBounds.json              |  6 +-
 rule_packages/c/Pointers1.json                | 21 ++++---
 rule_packages/c/Pointers3.json                |  9 ++-
 rule_packages/c/Preprocessor1.json            | 12 ++--
 rule_packages/c/Preprocessor2.json            | 13 ++--
 rule_packages/c/Preprocessor4.json            |  6 +-
 rule_packages/c/Preprocessor5.json            |  3 +-
 rule_packages/c/Preprocessor6.json            |  3 +-
 rule_packages/c/SideEffects1.json             |  9 ++-
 rule_packages/c/SideEffects3.json             |  3 +-
 rule_packages/c/SideEffects4.json             |  3 +-
 rule_packages/c/SignalHandlers.json           |  9 ++-
 .../c/StandardLibraryFunctionTypes.json       |  6 +-
 rule_packages/c/Statements1.json              |  6 +-
 rule_packages/c/Statements2.json              | 10 ++-
 rule_packages/c/Statements3.json              | 15 +++--
 rule_packages/c/Statements4.json              |  3 +-
 rule_packages/c/Statements5.json              |  7 ++-
 rule_packages/c/Statements6.json              |  3 +-
 rule_packages/c/Static.json                   |  3 +-
 rule_packages/c/Strings1.json                 |  6 +-
 rule_packages/c/Strings2.json                 |  3 +-
 rule_packages/c/Strings3.json                 |  3 +-
 rule_packages/c/Syntax.json                   | 10 ++-
 rule_packages/c/Types1.json                   |  3 +-
 rule_packages/c/Types2.json                   |  3 +-
 rule_packages/cpp/Allocations.json            | 36 +++++++----
 rule_packages/cpp/BannedAPIs.json             |  6 +-
 rule_packages/cpp/BannedFunctions.json        | 22 ++++---
 rule_packages/cpp/BannedSyntax.json           | 15 +++--
 rule_packages/cpp/BannedTypes.json            |  6 +-
 rule_packages/cpp/Classes.json                |  7 ++-
 rule_packages/cpp/Comments.json               |  4 +-
 rule_packages/cpp/Concurrency.json            | 21 ++++---
 rule_packages/cpp/Conditionals.json           | 31 ++++++---
 rule_packages/cpp/Const.json                  |  3 +-
 rule_packages/cpp/DeadCode.json               |  3 +-
 rule_packages/cpp/Declarations.json           | 18 ++++--
 rule_packages/cpp/ExceptionSafety.json        |  6 +-
 rule_packages/cpp/Exceptions1.json            | 61 ++++++++++++------
 rule_packages/cpp/Exceptions2.json            | 33 ++++++----
 rule_packages/cpp/Expressions.json            |  9 ++-
 rule_packages/cpp/Freed.json                  | 21 ++++---
 rule_packages/cpp/Functions.json              | 15 +++--
 rule_packages/cpp/IO.json                     |  6 +-
 rule_packages/cpp/ImportMisra23.json          | 63 ++++++++++++-------
 rule_packages/cpp/Includes.json               |  9 ++-
 rule_packages/cpp/Inheritance.json            | 21 +++++--
 rule_packages/cpp/Initialization.json         | 19 ++++--
 rule_packages/cpp/Invariants.json             |  9 ++-
 rule_packages/cpp/Iterators.json              | 19 ++++--
 rule_packages/cpp/Lambdas.json                | 15 +++--
 rule_packages/cpp/Literals.json               | 15 +++--
 rule_packages/cpp/Loops.json                  | 27 +++++---
 rule_packages/cpp/Macros.json                 | 13 ++--
 rule_packages/cpp/MoveForward.json            | 19 ++++--
 rule_packages/cpp/Naming.json                 |  3 +-
 rule_packages/cpp/Null.json                   |  6 +-
 rule_packages/cpp/OperatorInvariants.json     | 13 ++--
 rule_packages/cpp/Operators.json              | 19 ++++--
 rule_packages/cpp/OrderOfEvaluation.json      | 10 ++-
 rule_packages/cpp/OutOfBounds.json            |  6 +-
 rule_packages/cpp/Pointers.json               | 39 ++++++++----
 rule_packages/cpp/Representation.json         | 12 ++--
 rule_packages/cpp/Scope.json                  | 25 +++++---
 rule_packages/cpp/SmartPointers1.json         |  5 +-
 rule_packages/cpp/Strings.json                | 10 ++-
 rule_packages/cpp/Templates.json              |  9 ++-
 rule_packages/cpp/Toolchain.json              | 21 ++++---
 rule_packages/cpp/TypeRanges.json             | 15 +++--
 rule_packages/cpp/Uninitialized.json          |  3 +-
 rule_packages/cpp/VirtualFunctions.json       |  9 ++-
 123 files changed, 955 insertions(+), 451 deletions(-)

diff --git a/rule_packages/c/Alignment.json b/rule_packages/c/Alignment.json
index edf06a09c..add1b9d36 100644
--- a/rule_packages/c/Alignment.json
+++ b/rule_packages/c/Alignment.json
@@ -15,7 +15,9 @@
           "tags": [
             "external/misra/c/2012/amendment3",
             "readability",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -28,7 +30,9 @@
           "tags": [
             "external/misra/c/2012/amendment3",
             "readability",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -49,7 +53,8 @@
           "tags": [
             "external/misra/c/2012/amendment3",
             "readability",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -69,7 +74,8 @@
           "short_name": "MoreThanOneAlignmentSpecifierOnDeclaration",
           "tags": [
             "external/misra/c/2012/amendment3",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Banned.json b/rule_packages/c/Banned.json
index 265a41de5..2088ce704 100644
--- a/rule_packages/c/Banned.json
+++ b/rule_packages/c/Banned.json
@@ -41,7 +41,8 @@
           "shared_implementation_short_name": "CommaOperatorUsed",
           "tags": [
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -202,7 +203,8 @@
           "short_name": "StandardHeaderFileUsedSetjmph",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -264,7 +266,8 @@
           "shared_implementation_short_name": "AtofAtoiAtolAndAtollUsed",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -385,7 +388,9 @@
           "tags": [
             "correctness",
             "security",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Banned2.json b/rule_packages/c/Banned2.json
index 3898125d7..732aa5d39 100644
--- a/rule_packages/c/Banned2.json
+++ b/rule_packages/c/Banned2.json
@@ -14,7 +14,8 @@
           "short_name": "CallToBannedRandomFunction",
           "tags": [
             "security",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/BitfieldTypes.json b/rule_packages/c/BitfieldTypes.json
index 43ed42f17..d1148d5d0 100644
--- a/rule_packages/c/BitfieldTypes.json
+++ b/rule_packages/c/BitfieldTypes.json
@@ -34,7 +34,8 @@
           "short_name": "SingleBitNamedBitFieldsOfASignedType",
           "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType",
           "tags": [
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/BitfieldTypes2.json b/rule_packages/c/BitfieldTypes2.json
index 957e9bb72..553fdbb14 100644
--- a/rule_packages/c/BitfieldTypes2.json
+++ b/rule_packages/c/BitfieldTypes2.json
@@ -14,7 +14,8 @@
           "short_name": "BitFieldDeclaredAsMemberOfAUnion",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Concurrency1.json b/rule_packages/c/Concurrency1.json
index 9daa2a83b..d9a314d14 100644
--- a/rule_packages/c/Concurrency1.json
+++ b/rule_packages/c/Concurrency1.json
@@ -20,7 +20,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -45,7 +46,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Concurrency2.json b/rule_packages/c/Concurrency2.json
index d9e364d04..f2840ce50 100644
--- a/rule_packages/c/Concurrency2.json
+++ b/rule_packages/c/Concurrency2.json
@@ -46,7 +46,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Concurrency3.json b/rule_packages/c/Concurrency3.json
index 6328f6b43..c5eabd25b 100644
--- a/rule_packages/c/Concurrency3.json
+++ b/rule_packages/c/Concurrency3.json
@@ -20,7 +20,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This implementation does not allow for thread synchronization to be performed in subroutines. All synchronization must be performed within the context of the other thread management functions."
@@ -41,7 +42,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -67,7 +69,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This implementation does not attempt to identify unique condition variables and instead advocates for the usage of `cnd_broadcast`."
@@ -95,7 +98,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This implementation does not attempt to identify a relationship between the condition variable and the atomic operation."
diff --git a/rule_packages/c/Concurrency4.json b/rule_packages/c/Concurrency4.json
index b981ebaa8..84718629c 100644
--- a/rule_packages/c/Concurrency4.json
+++ b/rule_packages/c/Concurrency4.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query does not attempt to ensure that the deallocation function in fact deallocates memory and instead assumes the contract is valid. Additionally, this query requires that all `tss_create` calls are bookended by calls to `tss_delete`, even if a thread is not created."
diff --git a/rule_packages/c/Concurrency5.json b/rule_packages/c/Concurrency5.json
index d1a685dd3..cccc9c414 100644
--- a/rule_packages/c/Concurrency5.json
+++ b/rule_packages/c/Concurrency5.json
@@ -20,7 +20,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query considers problematic usages of join and detach irrespective of the execution of the program and other synchronization and interprocess communication mechanisms that may be used."
@@ -48,7 +49,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Concurrency6.json b/rule_packages/c/Concurrency6.json
index cfb793877..be4662ff9 100644
--- a/rule_packages/c/Concurrency6.json
+++ b/rule_packages/c/Concurrency6.json
@@ -16,7 +16,8 @@
           "tags": [
             "external/misra/c/2012/amendment4",
             "correctness",
-            "concurrency"
+            "concurrency",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -76,7 +77,8 @@
           "tags": [
             "external/misra/c/2012/amendment4",
             "correctness",
-            "concurrency"
+            "concurrency",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -119,7 +121,8 @@
           "tags": [
             "external/misra/c/2012/amendment4",
             "correctness",
-            "concurrency"
+            "concurrency",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query considers problematic usages of join and detach irrespective of the execution of the program and other synchronization and interprocess communication mechanisms that may be used."
diff --git a/rule_packages/c/Concurrency7.json b/rule_packages/c/Concurrency7.json
index bda888193..db6937e04 100644
--- a/rule_packages/c/Concurrency7.json
+++ b/rule_packages/c/Concurrency7.json
@@ -14,7 +14,8 @@
           "short_name": "UninitializedAtomicObject",
           "tags": [
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query tracks which functions may start threads, either indirectly or directly (\"thread spawning functions\"), and checks for local atomic variables that are not passed by address into `atomic_init` or other function calls, before such a thread spawning function is called.",
@@ -39,7 +40,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Concurrency8.json b/rule_packages/c/Concurrency8.json
index 2dc5d4804..64a0d0f39 100644
--- a/rule_packages/c/Concurrency8.json
+++ b/rule_packages/c/Concurrency8.json
@@ -15,7 +15,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -36,7 +37,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -57,7 +59,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -71,7 +74,8 @@
             "readability",
             "maintainability",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -84,7 +88,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -105,7 +110,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Concurrency9.json b/rule_packages/c/Concurrency9.json
index 6ae1df817..3967acb85 100644
--- a/rule_packages/c/Concurrency9.json
+++ b/rule_packages/c/Concurrency9.json
@@ -36,7 +36,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -57,7 +58,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -78,7 +80,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -92,7 +95,8 @@
             "correctness",
             "concurrency",
             "external/misra/c/2012/amendment4",
-            "external/misra/audit"
+            "external/misra/audit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -113,7 +117,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -134,7 +139,8 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -148,7 +154,8 @@
             "readability",
             "maintainability",
             "concurrency",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Contracts.json b/rule_packages/c/Contracts.json
index 0d2e0a97b..b24f8af16 100644
--- a/rule_packages/c/Contracts.json
+++ b/rule_packages/c/Contracts.json
@@ -18,7 +18,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query only considers the constraints related to inline extern functions."
diff --git a/rule_packages/c/Contracts1.json b/rule_packages/c/Contracts1.json
index 65ffdc5e7..89394618d 100644
--- a/rule_packages/c/Contracts1.json
+++ b/rule_packages/c/Contracts1.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -43,7 +44,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
diff --git a/rule_packages/c/Contracts2.json b/rule_packages/c/Contracts2.json
index 6c1bf77de..8de505570 100644
--- a/rule_packages/c/Contracts2.json
+++ b/rule_packages/c/Contracts2.json
@@ -18,7 +18,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p12",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -43,7 +44,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -60,7 +62,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -83,7 +86,8 @@
           "shared_implementation_short_name": "ConstLikeReturnValue",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -104,7 +108,8 @@
           "shared_implementation_short_name": "InvalidatedEnvStringPointers",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -117,7 +122,8 @@
           "shared_implementation_short_name": "InvalidatedEnvStringPointersWarn",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Contracts3.json b/rule_packages/c/Contracts3.json
index 0122b858b..19f882048 100644
--- a/rule_packages/c/Contracts3.json
+++ b/rule_packages/c/Contracts3.json
@@ -14,7 +14,8 @@
           "short_name": "OnlyTestErrnoRightAfterErrnoSettingFunction",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -34,7 +35,8 @@
           "short_name": "ErrnoSetToZeroPriorToCall",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -54,7 +56,8 @@
           "short_name": "ErrnoSetToZeroAfterCall",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Contracts4.json b/rule_packages/c/Contracts4.json
index a62e9d176..6554ab816 100644
--- a/rule_packages/c/Contracts4.json
+++ b/rule_packages/c/Contracts4.json
@@ -18,7 +18,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -34,7 +35,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -50,7 +52,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -66,7 +69,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Contracts5.json b/rule_packages/c/Contracts5.json
index d4b38b575..fc18dab89 100644
--- a/rule_packages/c/Contracts5.json
+++ b/rule_packages/c/Contracts5.json
@@ -18,7 +18,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p3",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
diff --git a/rule_packages/c/Contracts6.json b/rule_packages/c/Contracts6.json
index d89617d6d..405cf0c94 100644
--- a/rule_packages/c/Contracts6.json
+++ b/rule_packages/c/Contracts6.json
@@ -18,7 +18,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The implementation does not consider pointer aliasing via multiple indirection."
@@ -43,7 +44,8 @@
           "short_name": "ArrayFunctionArgumentNumberOfElements",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Contracts7.json b/rule_packages/c/Contracts7.json
index 95df01ca3..5d97b9d2e 100644
--- a/rule_packages/c/Contracts7.json
+++ b/rule_packages/c/Contracts7.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p27",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -43,7 +44,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p3",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -85,7 +87,8 @@
           "short_name": "ObjectAssignedToAnOverlappingObject",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -97,7 +100,8 @@
           "short_name": "ObjectCopiedToAnOverlappingObject",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/DeadCode.json b/rule_packages/c/DeadCode.json
index d8e80d14d..a2028088b 100644
--- a/rule_packages/c/DeadCode.json
+++ b/rule_packages/c/DeadCode.json
@@ -15,7 +15,8 @@
           "tags": [
             "readability",
             "maintainability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ],
           "implementation_scope": {
             "description": "This query reports basic blocks in the program which are unreachable. For basic blocks within templates, the block is only consider unreachable if it is unreachable in all templates. Code generated by macros is ignored for this query, because it may be the case that basic blocks are reachable only in some expansions."
@@ -40,7 +41,8 @@
           "tags": [
             "readability",
             "maintainability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -61,7 +63,8 @@
           "tags": [
             "readability",
             "maintainability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ],
           "shared_implementation_short_name": "UnusedTypeDeclarations"
         }
@@ -104,7 +107,8 @@
           "tags": [
             "readability",
             "maintainability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -125,7 +129,8 @@
           "tags": [
             "readability",
             "maintainability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/DeadCode2.json b/rule_packages/c/DeadCode2.json
index 8b373c31b..1ad9082a7 100644
--- a/rule_packages/c/DeadCode2.json
+++ b/rule_packages/c/DeadCode2.json
@@ -15,7 +15,8 @@
           "tags": [
             "maintainability",
             "performance",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/style"
           ]
         },
         {
diff --git a/rule_packages/c/Declarations1.json b/rule_packages/c/Declarations1.json
index dba6a07ee..dc10485cb 100644
--- a/rule_packages/c/Declarations1.json
+++ b/rule_packages/c/Declarations1.json
@@ -129,7 +129,9 @@
             "correctness",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ],
           "implementation_scope": {
             "description": "This query checks the first 63 characters of macro identifiers as significant, as per C99. Distinctness of parameters within the same function like macro are checked by compiler and therefore not checked by this rule.",
@@ -146,7 +148,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations2.json b/rule_packages/c/Declarations2.json
index c5b827e68..149c43f18 100644
--- a/rule_packages/c/Declarations2.json
+++ b/rule_packages/c/Declarations2.json
@@ -20,7 +20,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p3",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -113,7 +114,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations3.json b/rule_packages/c/Declarations3.json
index 8c2e0879f..f209183c9 100644
--- a/rule_packages/c/Declarations3.json
+++ b/rule_packages/c/Declarations3.json
@@ -104,7 +104,8 @@
           "tags": [
             "correctness",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ],
           "implementation_scope": {
             "description": "This query does not check for implicitly typed parameters, typedefs or member declarations as this is partially compiler checked.",
diff --git a/rule_packages/c/Declarations4.json b/rule_packages/c/Declarations4.json
index dedc6a73d..72fd8ee18 100644
--- a/rule_packages/c/Declarations4.json
+++ b/rule_packages/c/Declarations4.json
@@ -15,7 +15,8 @@
           "shared_implementation_short_name": "FunctionTypesNotInPrototypeFormShared",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ],
           "implementation_scope": {
             "description": "This query does not check for implicitly typed parameters and checks function declarations and definitions but not function pointer types. This query cannot determine when the keyword void is used in place of no parameter.",
diff --git a/rule_packages/c/Declarations5.json b/rule_packages/c/Declarations5.json
index 36591e575..7865071f2 100644
--- a/rule_packages/c/Declarations5.json
+++ b/rule_packages/c/Declarations5.json
@@ -16,7 +16,8 @@
             "correctness",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query considers the first 63 characters of identifiers as significant, as per C99 for nonexternal identifiers and reports the case when names are longer than 63 characters and differ in those characters past the 63 first only. This query does not consider universal or extended source characters.",
@@ -61,7 +62,9 @@
           "shared_implementation_short_name": "MissingStaticSpecifierFunctionRedeclarationShared",
           "tags": [
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -74,7 +77,9 @@
           "shared_implementation_short_name": "MissingStaticSpecifierObjectRedeclarationShared",
           "tags": [
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations6.json b/rule_packages/c/Declarations6.json
index 198b4e835..b6802c7a2 100644
--- a/rule_packages/c/Declarations6.json
+++ b/rule_packages/c/Declarations6.json
@@ -15,7 +15,8 @@
           "tags": [
             "correctness",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -35,7 +36,9 @@
           "short_name": "FlexibleArrayMembersDeclared",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -100,7 +103,9 @@
           "short_name": "InlineFunctionNotDeclaredStaticStorage",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -121,7 +126,8 @@
           "tags": [
             "correctness",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations7.json b/rule_packages/c/Declarations7.json
index 86818cdcb..3633b7552 100644
--- a/rule_packages/c/Declarations7.json
+++ b/rule_packages/c/Declarations7.json
@@ -45,7 +45,9 @@
           "tags": [
             "correctness",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -67,7 +69,9 @@
           "tags": [
             "correctness",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations8.json b/rule_packages/c/Declarations8.json
index 6275e3259..a59a21585 100644
--- a/rule_packages/c/Declarations8.json
+++ b/rule_packages/c/Declarations8.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule checks specifically for pointers to objects with automatic storage duration that are assigned to static storage duration variables."
@@ -38,7 +39,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule checks specifically for pointers to objects with automatic storage duration that are returned by functions or assigned to function output parameters."
diff --git a/rule_packages/c/Declarations9.json b/rule_packages/c/Declarations9.json
index ebfcf7c41..014fb537a 100644
--- a/rule_packages/c/Declarations9.json
+++ b/rule_packages/c/Declarations9.json
@@ -15,7 +15,8 @@
           "tags": [
             "correctness",
             "external/misra/c/2012/third-edition-first-revision",
-            "external/misra/c/2012/amendment4"
+            "external/misra/c/2012/amendment4",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/EssentialTypes.json b/rule_packages/c/EssentialTypes.json
index a8ae26e8c..7490bebe0 100644
--- a/rule_packages/c/EssentialTypes.json
+++ b/rule_packages/c/EssentialTypes.json
@@ -194,7 +194,8 @@
           "tags": [
             "maintainability",
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -215,7 +216,8 @@
           "tags": [
             "maintainability",
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/EssentialTypes2.json b/rule_packages/c/EssentialTypes2.json
index 5292eccdb..6c53ab4d2 100644
--- a/rule_packages/c/EssentialTypes2.json
+++ b/rule_packages/c/EssentialTypes2.json
@@ -37,7 +37,8 @@
           "short_name": "TgMathArgumentsWithDifferingStandardType",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Expressions.json b/rule_packages/c/Expressions.json
index 9be722b76..c961052e0 100644
--- a/rule_packages/c/Expressions.json
+++ b/rule_packages/c/Expressions.json
@@ -18,7 +18,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query raises a result for a function assigned to a function pointer of an incompatible type even if the function pointer is never eventually called."
@@ -37,7 +38,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -54,7 +56,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The analysis of invalid parameter count passed to POSIX open calls only applies when the value of the flags argument is computed locally."
@@ -82,7 +85,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p9",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/FloatingTypes.json b/rule_packages/c/FloatingTypes.json
index 17690574e..9b5ea9a65 100644
--- a/rule_packages/c/FloatingTypes.json
+++ b/rule_packages/c/FloatingTypes.json
@@ -94,7 +94,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Generics.json b/rule_packages/c/Generics.json
index 02c7cb236..7ae337bd2 100644
--- a/rule_packages/c/Generics.json
+++ b/rule_packages/c/Generics.json
@@ -14,7 +14,9 @@
           "short_name": "GenericSelectionNotExpandedFromAMacro",
           "tags": [
             "maintainability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -27,7 +29,9 @@
           "tags": [
             "correctness",
             "maintainability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -72,7 +76,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -92,7 +97,8 @@
           "short_name": "GenericAssociationWithUnselectableType",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -112,7 +118,8 @@
           "short_name": "DangerousDefaultSelectionForPointerInGeneric",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -157,7 +164,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -181,7 +189,8 @@
           "short_name": "DefaultGenericSelectionNotFirstOrLast",
           "tags": [
             "maintainability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/IO1.json b/rule_packages/c/IO1.json
index 8a42c4e52..1fe370659 100644
--- a/rule_packages/c/IO1.json
+++ b/rule_packages/c/IO1.json
@@ -20,7 +20,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -93,7 +94,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
@@ -150,7 +152,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
@@ -176,7 +179,8 @@
           "shared_implementation_short_name": "DoNotAccessAClosedFile",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
diff --git a/rule_packages/c/IO2.json b/rule_packages/c/IO2.json
index 69c12d772..fab7ae5bb 100644
--- a/rule_packages/c/IO2.json
+++ b/rule_packages/c/IO2.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -44,7 +45,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -68,7 +70,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/IO3.json b/rule_packages/c/IO3.json
index af6e9da73..1ae242c49 100644
--- a/rule_packages/c/IO3.json
+++ b/rule_packages/c/IO3.json
@@ -46,7 +46,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p12",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule checks that access to a string returned by fgets() or fgetws() if protected by a guard condition. The rule is enforced in the context of a single function."
@@ -71,7 +72,8 @@
           "short_name": "FileOpenForReadAndWriteOnDifferentStreams",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
@@ -94,7 +96,8 @@
           "short_name": "AttemptToWriteToAReadOnlyStream",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -114,7 +117,8 @@
           "short_name": "PointerToAFileObjectDereferenced",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -134,7 +138,8 @@
           "short_name": "EofShallBeComparedWithUnmodifiedReturnValues",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/IO4.json b/rule_packages/c/IO4.json
index 8d9c15033..fca7fe37f 100644
--- a/rule_packages/c/IO4.json
+++ b/rule_packages/c/IO4.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The query is limited to the specific class of TOCTOU race conditions that derives from the incorrectuse of `fopen` to check the existence of a file."
@@ -47,7 +48,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -64,7 +66,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -81,7 +84,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/IntegerOverflow.json b/rule_packages/c/IntegerOverflow.json
index f528d3d54..60a5827da 100644
--- a/rule_packages/c/IntegerOverflow.json
+++ b/rule_packages/c/IntegerOverflow.json
@@ -117,7 +117,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -141,7 +142,8 @@
           "tags": [
             "correctness",
             "security",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/InvalidMemory1.json b/rule_packages/c/InvalidMemory1.json
index 3b0a6bb40..6c2cbae06 100644
--- a/rule_packages/c/InvalidMemory1.json
+++ b/rule_packages/c/InvalidMemory1.json
@@ -70,7 +70,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -94,7 +95,8 @@
           "tags": [
             "correctness",
             "security",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/InvalidMemory2.json b/rule_packages/c/InvalidMemory2.json
index 025a5d246..eddddfda0 100644
--- a/rule_packages/c/InvalidMemory2.json
+++ b/rule_packages/c/InvalidMemory2.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -67,7 +68,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This implementation also always reports non-modifying accesses of objects with temporary lifetime, which are only compliant in C11."
diff --git a/rule_packages/c/InvalidMemory3.json b/rule_packages/c/InvalidMemory3.json
index feeb8b2b4..fddeae071 100644
--- a/rule_packages/c/InvalidMemory3.json
+++ b/rule_packages/c/InvalidMemory3.json
@@ -15,7 +15,8 @@
           "tags": [
             "external/misra/c/2012/amendment4",
             "correctness",
-            "security"
+            "security",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -36,7 +37,8 @@
           "tags": [
             "external/misra/c/2012/amendment3",
             "correctness",
-            "security"
+            "security",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -49,7 +51,8 @@
           "tags": [
             "external/misra/c/2012/amendment3",
             "correctness",
-            "security"
+            "security",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Language4.json b/rule_packages/c/Language4.json
index fdc11924f..30727489b 100644
--- a/rule_packages/c/Language4.json
+++ b/rule_packages/c/Language4.json
@@ -15,7 +15,9 @@
           "shared_implementation_short_name": "MissingStaticSpecifierFunctionRedeclarationShared",
           "tags": [
             "readability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -28,7 +30,9 @@
           "shared_implementation_short_name": "MissingStaticSpecifierObjectRedeclarationShared",
           "tags": [
             "readability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -41,7 +45,9 @@
           "shared_implementation_short_name": "FunctionTypesNotInPrototypeFormShared",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ],
           "implementation_scope": {
             "description": "This query does not check for implicitly typed parameters and checks function declarations and definitions but not function pointer types."
@@ -57,7 +63,9 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -70,7 +78,9 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -83,7 +93,9 @@
           "tags": [
             "external/misra/c/2012/amendment3",
             "security",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -96,7 +108,9 @@
           "tags": [
             "external/misra/c/2012/amendment3",
             "security",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -108,7 +122,9 @@
           "short_name": "SizeInReallocCallMayBeZero",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -120,7 +136,9 @@
           "short_name": "SizeInReallocCallIsZero",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Memory1.json b/rule_packages/c/Memory1.json
index 8515fe15e..b9b59a00b 100644
--- a/rule_packages/c/Memory1.json
+++ b/rule_packages/c/Memory1.json
@@ -16,7 +16,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -37,7 +38,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -59,7 +61,8 @@
             "correctness",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Memory2.json b/rule_packages/c/Memory2.json
index 55a7dd2a3..d7014c7c1 100644
--- a/rule_packages/c/Memory2.json
+++ b/rule_packages/c/Memory2.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -36,7 +37,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -114,7 +116,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p3",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -130,7 +133,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p3",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -181,7 +185,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -205,7 +210,8 @@
           "tags": [
             "correctness",
             "security",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
@@ -222,7 +228,8 @@
           "tags": [
             "correctness",
             "security",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
@@ -247,7 +254,8 @@
           "tags": [
             "correctness",
             "security",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Misc.json b/rule_packages/c/Misc.json
index 183c05988..3664b4265 100644
--- a/rule_packages/c/Misc.json
+++ b/rule_packages/c/Misc.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -43,7 +44,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This rule will be checked by looking for calls to random that are no preceded by a call to srandom(). We perform a simple check for the argument to srandom() and verify it is not a literal (or a value easily deduced to be a literal)."
diff --git a/rule_packages/c/NoReturn.json b/rule_packages/c/NoReturn.json
index f48506009..a8d5f3781 100644
--- a/rule_packages/c/NoReturn.json
+++ b/rule_packages/c/NoReturn.json
@@ -34,7 +34,8 @@
           "short_name": "FunctionWithNoReturningBranchShouldBeNoreturn",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -54,7 +55,8 @@
           "short_name": "ReturnStatementInNoreturnFunction",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety"
           ],
           "shared_implementation_short_name": "FunctionNoReturnAttributeCondition"
         }
diff --git a/rule_packages/c/OutOfBounds.json b/rule_packages/c/OutOfBounds.json
index 335434823..f35d6171c 100644
--- a/rule_packages/c/OutOfBounds.json
+++ b/rule_packages/c/OutOfBounds.json
@@ -67,7 +67,8 @@
           "tags": [
             "correctness",
             "security",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -88,7 +89,8 @@
           "tags": [
             "correctness",
             "security",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Pointers1.json b/rule_packages/c/Pointers1.json
index 1b54fc1fb..3dd31d1b5 100644
--- a/rule_packages/c/Pointers1.json
+++ b/rule_packages/c/Pointers1.json
@@ -34,7 +34,8 @@
           "short_name": "ConversionBetweenIncompleteTypePointerAndOtherType",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -134,7 +135,8 @@
           "short_name": "CastBetweenPointerToObjectAndNonIntArithmeticType",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -174,7 +176,8 @@
           "short_name": "MacroNullNotUsedAsIntegerNullPointerConstant",
           "tags": [
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ],
           "implementation_scope": {
             "description": "This rule allows two forms of null-pointer constants: a Zero literal created by the NULL macro or a Zero literal cast to a void pointer."
@@ -282,7 +285,8 @@
           "shared_implementation_short_name": "DoNotUseMoreThanTwoLevelsOfPointerIndirection",
           "tags": [
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -303,7 +307,8 @@
           "shared_implementation_short_name": "DoNotCopyAddressOfAutoStorageObjectToOtherObject",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -315,7 +320,8 @@
           "short_name": "ThreadLocalObjectAddressCopiedToGlobalObject",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -361,7 +367,8 @@
             "correctness",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ],
           "implementation_scope": {
             "description": "To exclude compliant exceptions, this rule only excludes direct assignments of pointers to non-const-qualified types in the context of a single function and does not cover memory-copying functions. This rule also excludes pointers passed to other functions without conversion."
diff --git a/rule_packages/c/Pointers3.json b/rule_packages/c/Pointers3.json
index 8a169b71a..86056f30f 100644
--- a/rule_packages/c/Pointers3.json
+++ b/rule_packages/c/Pointers3.json
@@ -18,7 +18,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "In limited cases, this query can raise false-positives for assignment of volatile objects and subsequent accesses of those objects via non-volatile pointers."
@@ -94,7 +95,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -110,7 +112,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Preprocessor1.json b/rule_packages/c/Preprocessor1.json
index cf4f02302..f402fa2bf 100644
--- a/rule_packages/c/Preprocessor1.json
+++ b/rule_packages/c/Preprocessor1.json
@@ -15,7 +15,8 @@
           "shared_implementation_short_name": "PreprocessorIncludesPreceded",
           "tags": [
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -36,7 +37,8 @@
           "shared_implementation_short_name": "HashOperatorsUsed",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -57,7 +59,8 @@
           "shared_implementation_short_name": "PreprocessorIncludesForbiddenHeaderNames",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ],
           "implementation_scope": {
             "description": "This query identifies the use of the ', \\, /*, // characters in header file names. The query is not able to detect the use of the \" character in header file names.",
@@ -83,7 +86,8 @@
           "tags": [
             "correctness",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query does not detect the case where an undefined character is used but not actually evaluated, for example, as a result of the inclusion of a logical AND operator in the #if expression.",
diff --git a/rule_packages/c/Preprocessor2.json b/rule_packages/c/Preprocessor2.json
index 62bb0b770..98c0ac025 100644
--- a/rule_packages/c/Preprocessor2.json
+++ b/rule_packages/c/Preprocessor2.json
@@ -15,7 +15,9 @@
           "shared_implementation_short_name": "MacroParameterFollowingHash",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ],
           "implementation_scope": {
             "description": "This query applies to function like macros and not object like macros. This rule strictly disallows the use of # operator followed by a ## and other combinations are permitted.",
@@ -41,7 +43,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -62,7 +65,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -85,7 +89,8 @@
             "correctness",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ],
           "implementation_scope": {
             "description": "This query defines header file as any file that is included regardless of file extension. This query does not consider the use of `#pragma once` as a permitted header guard.",
diff --git a/rule_packages/c/Preprocessor4.json b/rule_packages/c/Preprocessor4.json
index 608a23d97..a78509887 100644
--- a/rule_packages/c/Preprocessor4.json
+++ b/rule_packages/c/Preprocessor4.json
@@ -16,7 +16,8 @@
             "correctness",
             "readability",
             "maintainability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -38,7 +39,8 @@
           "tags": [
             "readability",
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Preprocessor5.json b/rule_packages/c/Preprocessor5.json
index 60a1752e7..bb3d67acd 100644
--- a/rule_packages/c/Preprocessor5.json
+++ b/rule_packages/c/Preprocessor5.json
@@ -48,7 +48,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query defines end of function call as the next node in the control flow graph.",
diff --git a/rule_packages/c/Preprocessor6.json b/rule_packages/c/Preprocessor6.json
index 6d71b8697..1f5414c16 100644
--- a/rule_packages/c/Preprocessor6.json
+++ b/rule_packages/c/Preprocessor6.json
@@ -17,7 +17,8 @@
             "external/misra/audit",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/SideEffects1.json b/rule_packages/c/SideEffects1.json
index 4dec3d8bb..2cb77df05 100644
--- a/rule_packages/c/SideEffects1.json
+++ b/rule_packages/c/SideEffects1.json
@@ -136,7 +136,8 @@
           "short_name": "InitializerListsContainPersistentSideEffects",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -158,7 +159,8 @@
           "tags": [
             "correctness",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -198,7 +200,8 @@
           "short_name": "SizeofOperandWithSideEffect",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/SideEffects3.json b/rule_packages/c/SideEffects3.json
index 1ff29ec16..9ff78255f 100644
--- a/rule_packages/c/SideEffects3.json
+++ b/rule_packages/c/SideEffects3.json
@@ -14,7 +14,8 @@
           "short_name": "UnsequencedSideEffects",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         },
         {
diff --git a/rule_packages/c/SideEffects4.json b/rule_packages/c/SideEffects4.json
index 5b0c6da3f..d4c6d6072 100644
--- a/rule_packages/c/SideEffects4.json
+++ b/rule_packages/c/SideEffects4.json
@@ -18,7 +18,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p3",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This implementation only considers ++ and function call side effects. Due to the textual nature of macro expansion it is not always possible to determine accurately whether a side-effect was produced by a particular argument, and this may cause both false positives and false negatives. The query does not consider the case where a macro argument including a side-effect is never evaluated."
diff --git a/rule_packages/c/SignalHandlers.json b/rule_packages/c/SignalHandlers.json
index ae9045a64..81eec2f85 100644
--- a/rule_packages/c/SignalHandlers.json
+++ b/rule_packages/c/SignalHandlers.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -72,7 +73,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p3",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -97,7 +99,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p1",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/StandardLibraryFunctionTypes.json b/rule_packages/c/StandardLibraryFunctionTypes.json
index ee0d7f5af..625496042 100644
--- a/rule_packages/c/StandardLibraryFunctionTypes.json
+++ b/rule_packages/c/StandardLibraryFunctionTypes.json
@@ -13,7 +13,8 @@
           "severity": "error",
           "short_name": "CtypeFunctionArgNotUnsignedCharOrEof",
           "tags": [
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -32,7 +33,8 @@
           "severity": "error",
           "short_name": "MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes",
           "tags": [
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Statements1.json b/rule_packages/c/Statements1.json
index c932a8642..d48b604d9 100644
--- a/rule_packages/c/Statements1.json
+++ b/rule_packages/c/Statements1.json
@@ -16,7 +16,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -77,7 +78,8 @@
           "severity": "recommendation",
           "short_name": "DefaultNotFirstOrLastOfSwitch",
           "tags": [
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Statements2.json b/rule_packages/c/Statements2.json
index 9cd71b69c..ab2bf8580 100644
--- a/rule_packages/c/Statements2.json
+++ b/rule_packages/c/Statements2.json
@@ -16,7 +16,9 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -38,7 +40,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -80,7 +83,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Statements3.json b/rule_packages/c/Statements3.json
index 94206d485..7e25259c5 100644
--- a/rule_packages/c/Statements3.json
+++ b/rule_packages/c/Statements3.json
@@ -15,7 +15,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -28,7 +29,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -41,7 +43,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -85,7 +88,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -99,7 +103,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Statements4.json b/rule_packages/c/Statements4.json
index e770fe032..96799fc7c 100644
--- a/rule_packages/c/Statements4.json
+++ b/rule_packages/c/Statements4.json
@@ -20,7 +20,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Statements5.json b/rule_packages/c/Statements5.json
index 03380f489..2734f36c2 100644
--- a/rule_packages/c/Statements5.json
+++ b/rule_packages/c/Statements5.json
@@ -16,7 +16,8 @@
             "correctness",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -64,7 +65,9 @@
             "correctness",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Statements6.json b/rule_packages/c/Statements6.json
index c8ab3efe3..be9d2fefe 100644
--- a/rule_packages/c/Statements6.json
+++ b/rule_packages/c/Statements6.json
@@ -16,7 +16,8 @@
           "tags": [
             "correctness",
             "security",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Static.json b/rule_packages/c/Static.json
index 2af2af402..941a18edb 100644
--- a/rule_packages/c/Static.json
+++ b/rule_packages/c/Static.json
@@ -14,7 +14,8 @@
           "short_name": "UseOfArrayStatic",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The static keyword is associated with particular array types in our model. This means we can get false positives when two parameter use the same array type and size, but only one of which uses the `static` keyword."
diff --git a/rule_packages/c/Strings1.json b/rule_packages/c/Strings1.json
index c4565fc89..227f934a5 100644
--- a/rule_packages/c/Strings1.json
+++ b/rule_packages/c/Strings1.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p9",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -44,7 +45,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "The enforcement of this rule does not try to approximate the effects of loops and as such may not find cases where a loop operation on a string fails to null terminate a string (or causes an overflow)."
diff --git a/rule_packages/c/Strings2.json b/rule_packages/c/Strings2.json
index a32b1b4c2..a664caf4f 100644
--- a/rule_packages/c/Strings2.json
+++ b/rule_packages/c/Strings2.json
@@ -19,7 +19,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p3",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Strings3.json b/rule_packages/c/Strings3.json
index c9003f2ff..5682456d0 100644
--- a/rule_packages/c/Strings3.json
+++ b/rule_packages/c/Strings3.json
@@ -45,7 +45,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p27",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "Wide character types are not handled correctly on the `aarch64le` architecture. This can lead to false negative alerts."
diff --git a/rule_packages/c/Syntax.json b/rule_packages/c/Syntax.json
index e588c366c..2b68aee0d 100644
--- a/rule_packages/c/Syntax.json
+++ b/rule_packages/c/Syntax.json
@@ -37,7 +37,9 @@
             "maintainability",
             "readability",
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -60,7 +62,8 @@
             "maintainability",
             "readability",
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -83,7 +86,8 @@
             "maintainability",
             "readability",
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/c/Types1.json b/rule_packages/c/Types1.json
index bb451eba7..c08f2f24a 100644
--- a/rule_packages/c/Types1.json
+++ b/rule_packages/c/Types1.json
@@ -80,7 +80,8 @@
           "severity": "error",
           "short_name": "SizeofOperatorUsedOnArrayTypeParam",
           "tags": [
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Types2.json b/rule_packages/c/Types2.json
index 7e4c0827f..6ab3dde7d 100644
--- a/rule_packages/c/Types2.json
+++ b/rule_packages/c/Types2.json
@@ -74,7 +74,8 @@
           "short_name": "UseOfBannedSmallIntegerConstantMacro",
           "tags": [
             "readability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Allocations.json b/rule_packages/cpp/Allocations.json
index 416cd3b56..d2c1709ba 100644
--- a/rule_packages/cpp/Allocations.json
+++ b/rule_packages/cpp/Allocations.json
@@ -115,7 +115,8 @@
           "short_name": "UnnecessaryUseOfDynamicStorage",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -139,7 +140,8 @@
           "short_name": "ThrowingOperatorNewReturnsNullAutosar",
           "shared_implementation_short_name": "ThrowingOperatorNewReturnsNull",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -151,7 +153,8 @@
           "short_name": "ThrowingOperatorNewThrowsInvalidExceptionAutosar",
           "shared_implementation_short_name": "ThrowingOperatorNewThrowsInvalidException",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -163,7 +166,8 @@
           "short_name": "ThrowingNoThrowOperatorNewDeleteAutosar",
           "shared_implementation_short_name": "ThrowingNoThrowOperatorNewDelete",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -175,7 +179,8 @@
           "short_name": "OperatorDeleteMissingPartnerAutosar",
           "shared_implementation_short_name": "OperatorDeleteMissingPartner",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -202,7 +207,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -226,7 +232,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -250,7 +257,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -266,7 +274,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -292,7 +301,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -310,7 +320,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -411,7 +422,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/BannedAPIs.json b/rule_packages/cpp/BannedAPIs.json
index 3bb456fdd..936df4c3a 100644
--- a/rule_packages/cpp/BannedAPIs.json
+++ b/rule_packages/cpp/BannedAPIs.json
@@ -16,7 +16,8 @@
           "tags": [
             "scope/single-translation-unit",
             "maintainability",
-            "correctness"
+            "correctness",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -127,7 +128,8 @@
           "tags": [
             "scope/single-translation-unit",
             "correctness",
-            "maintainability"
+            "maintainability",
+            "codingstandards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/BannedFunctions.json b/rule_packages/cpp/BannedFunctions.json
index 6cdb019ac..906e623f3 100644
--- a/rule_packages/cpp/BannedFunctions.json
+++ b/rule_packages/cpp/BannedFunctions.json
@@ -67,7 +67,8 @@
           "shared_implementation_short_name": "DoNotUseRandForGeneratingPseudorandomNumbers",
           "tags": [
             "security",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -92,7 +93,8 @@
           "shared_implementation_short_name": "DoNotUseSetjmpOrLongjmpShared",
           "tags": [
             "correctness",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -117,7 +119,8 @@
           "tags": [
             "correctness",
             "security",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -142,7 +145,8 @@
           "tags": [
             "correctness",
             "security",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -220,7 +224,9 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -246,7 +252,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -271,7 +278,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/BannedSyntax.json b/rule_packages/cpp/BannedSyntax.json
index 8f739145f..06355ff03 100644
--- a/rule_packages/cpp/BannedSyntax.json
+++ b/rule_packages/cpp/BannedSyntax.json
@@ -199,7 +199,8 @@
           "tags": [
             "correctness",
             "security",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -223,7 +224,8 @@
           "short_name": "RegisterKeywordUsed",
           "tags": [
             "correctness",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -346,7 +348,8 @@
           "shared_implementation_short_name": "CommaOperatorUsed",
           "tags": [
             "correctness",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -394,7 +397,8 @@
           "short_name": "UsingDeclarationsUsedInHeaderFiles",
           "tags": [
             "correctness",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -422,7 +426,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p12",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "codingstandards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/BannedTypes.json b/rule_packages/cpp/BannedTypes.json
index e84399b92..a9f241e02 100644
--- a/rule_packages/cpp/BannedTypes.json
+++ b/rule_packages/cpp/BannedTypes.json
@@ -44,7 +44,8 @@
           "shared_implementation_short_name": "VectorShouldNotBeSpecializedWithBool",
           "tags": [
             "correctness",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -68,7 +69,8 @@
           "short_name": "AutoPtrTypeUsed",
           "tags": [
             "maintainability",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Classes.json b/rule_packages/cpp/Classes.json
index e7c8a10d9..92bc3ff56 100644
--- a/rule_packages/cpp/Classes.json
+++ b/rule_packages/cpp/Classes.json
@@ -118,7 +118,9 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "ClassDataMembersInitializationCondition",
-          "tags": []
+          "tags": [
+            "codingstandards/baseline/style"
+          ]
         }
       ],
       "title": "All class data members that are initialized by the constructor shall be initialized using member initializers."
@@ -186,7 +188,8 @@
           "severity": "recommendation",
           "short_name": "NonTrivialNonTemplateFunctionDefinedInsideClassDefinition",
           "tags": [
-            "external/autosar/audit"
+            "external/autosar/audit",
+            "codingstandards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Comments.json b/rule_packages/cpp/Comments.json
index 2421bec52..02d257223 100644
--- a/rule_packages/cpp/Comments.json
+++ b/rule_packages/cpp/Comments.json
@@ -20,7 +20,9 @@
           "tags": [
             "correctness",
             "readability",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety",
+            "codingstandards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Concurrency.json b/rule_packages/cpp/Concurrency.json
index 3bba2f409..6ca7af9fc 100644
--- a/rule_packages/cpp/Concurrency.json
+++ b/rule_packages/cpp/Concurrency.json
@@ -20,7 +20,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -38,7 +39,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -63,7 +65,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -89,7 +92,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -115,7 +119,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -141,7 +146,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -167,7 +173,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Conditionals.json b/rule_packages/cpp/Conditionals.json
index 584df1942..f60670c5d 100644
--- a/rule_packages/cpp/Conditionals.json
+++ b/rule_packages/cpp/Conditionals.json
@@ -81,7 +81,8 @@
           "shared_implementation_short_name": "SwitchCompoundCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -94,7 +95,8 @@
           "shared_implementation_short_name": "LoopCompoundCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -118,7 +120,8 @@
           "short_name": "IfCompoundCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -168,7 +171,8 @@
           "shared_implementation_short_name": "SwitchCasePositionCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -181,7 +185,8 @@
           "shared_implementation_short_name": "SwitchNotWellFormed",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -206,7 +211,9 @@
           "shared_implementation_short_name": "NestedLabelInSwitch",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -230,7 +237,8 @@
           "short_name": "NonEmptySwitchClauseDoesNotTerminate",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -290,7 +298,8 @@
           "short_name": "BooleanInSwitchCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -314,7 +323,8 @@
           "short_name": "GotoBlockCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -339,7 +349,8 @@
           "shared_implementation_short_name": "GotoStatementCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Const.json b/rule_packages/cpp/Const.json
index 6f76b7f5b..00e603b4c 100644
--- a/rule_packages/cpp/Const.json
+++ b/rule_packages/cpp/Const.json
@@ -195,7 +195,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/DeadCode.json b/rule_packages/cpp/DeadCode.json
index 4746f86de..738224482 100644
--- a/rule_packages/cpp/DeadCode.json
+++ b/rule_packages/cpp/DeadCode.json
@@ -18,7 +18,8 @@
           "short_name": "UselessAssignment",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Declarations.json b/rule_packages/cpp/Declarations.json
index 61d286026..630c03547 100644
--- a/rule_packages/cpp/Declarations.json
+++ b/rule_packages/cpp/Declarations.json
@@ -17,7 +17,8 @@
           "severity": "error",
           "short_name": "OperatorNewAndOperatorDeleteNotDefinedLocally",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -28,7 +29,8 @@
           "severity": "error",
           "short_name": "OperatorNewAndOperatorDeleteNotDefinedGlobally",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -197,7 +199,8 @@
           "severity": "recommendation",
           "short_name": "ClassStructEnumDeclaredInDefinition",
           "tags": [
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -245,7 +248,8 @@
           "severity": "recommendation",
           "short_name": "EnumerationsNotDeclaredAsScopedEnumClasses",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -269,7 +273,8 @@
           "short_name": "NoneFirstOrAllEnumeratorsNotInitialized",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -293,7 +298,8 @@
           "short_name": "FunctionsDeclaredAtBlockScope",
           "tags": [
             "correctness",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/ExceptionSafety.json b/rule_packages/cpp/ExceptionSafety.json
index 73b84edde..e29e28904 100644
--- a/rule_packages/cpp/ExceptionSafety.json
+++ b/rule_packages/cpp/ExceptionSafety.json
@@ -95,7 +95,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p9",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -121,7 +122,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Exceptions1.json b/rule_packages/cpp/Exceptions1.json
index 7c3a2a708..725fcedaf 100644
--- a/rule_packages/cpp/Exceptions1.json
+++ b/rule_packages/cpp/Exceptions1.json
@@ -92,7 +92,8 @@
           "short_name": "PointerExceptionObject",
           "shared_implementation_short_name": "ExceptionObjectHavePointerType",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -159,7 +160,8 @@
           "short_name": "MissingCatchHandlerInMain",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -181,7 +183,8 @@
           "severity": "error",
           "short_name": "CatchAllEllipsisUsedInNonMain",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -203,7 +206,8 @@
           "severity": "warning",
           "short_name": "UseOfDynamicExceptionSpecification",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -355,7 +359,8 @@
           "severity": "error",
           "short_name": "GotoToCatchBlock",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -365,7 +370,8 @@
           "severity": "error",
           "short_name": "SwitchToCatchBlock",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -387,7 +393,8 @@
           "severity": "warning",
           "short_name": "ExceptionThrownDuringThrow",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -409,7 +416,8 @@
           "severity": "error",
           "short_name": "NullThrownExplicitly",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -432,7 +440,8 @@
           "short_name": "EmptyThrowOutsideCatch",
           "shared_implementation_short_name": "EmptyThrowOnlyWithinACatchHandler",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -455,7 +464,8 @@
           "kind": "path-problem",
           "short_name": "CatchAllExplicitlyThrownExceptions",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -477,7 +487,8 @@
           "severity": "warning",
           "short_name": "CatchAllHandlerLast",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "Catch all handlers that cause other catch handlers to become unreachable are typically flagged as compiler errors. If you observe alerts for this rule, it is likely that you have passed a compiler flag that converts these errors to warnings - for example the `-fpermissive` flag for g++. Consider removing the permissive flag in addition to addressing the problem."
@@ -507,7 +518,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -523,7 +535,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -540,7 +553,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -557,7 +571,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -574,7 +589,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -598,7 +614,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -622,7 +639,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -694,7 +712,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -718,7 +737,9 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p3",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Exceptions2.json b/rule_packages/cpp/Exceptions2.json
index 2e2f2dfba..58a8fe2f0 100644
--- a/rule_packages/cpp/Exceptions2.json
+++ b/rule_packages/cpp/Exceptions2.json
@@ -17,7 +17,8 @@
           "severity": "recommendation",
           "short_name": "OnlyThrowStdExceptionDerivedTypes",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -40,7 +41,8 @@
           "severity": "error",
           "short_name": "ConstructorErrorLeavesObjectInInvalidState",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -87,7 +89,8 @@
           "severity": "error",
           "short_name": "IncompatibleNoexceptSpecification",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -98,7 +101,8 @@
           "severity": "error",
           "short_name": "InconsistentNoexceptFalseSpecification",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -109,7 +113,8 @@
           "severity": "error",
           "short_name": "InconsistentNoexceptTrueSpecification",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -120,7 +125,8 @@
           "severity": "error",
           "short_name": "IncompatibleNoexceptSpecificationForOverriders",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -215,7 +221,8 @@
           "shared_implementation_short_name": "HandleAllExceptionsDuringStartup",
           "short_name": "ExceptionRaisedDuringStartup",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -226,7 +233,8 @@
           "severity": "error",
           "short_name": "ExceptionRaisedDuringTermination",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -250,7 +258,8 @@
           "shared_implementation_short_name": "DestroyedValueReferencedInDestructorCatchBlock",
           "short_name": "DestroyedValueReferencedInDestructorCatchBlock",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -300,7 +309,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -325,7 +335,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Expressions.json b/rule_packages/cpp/Expressions.json
index 10f85237d..7ccfd8457 100644
--- a/rule_packages/cpp/Expressions.json
+++ b/rule_packages/cpp/Expressions.json
@@ -256,7 +256,8 @@
           "shared_implementation_short_name": "ConstantUnsignedIntegerExpressionsWrapAround",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -302,7 +303,8 @@
           "severity": "warning",
           "short_name": "FloatsTestedForEquality",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -328,7 +330,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
diff --git a/rule_packages/cpp/Freed.json b/rule_packages/cpp/Freed.json
index 30ab6982b..096e7ed8f 100644
--- a/rule_packages/cpp/Freed.json
+++ b/rule_packages/cpp/Freed.json
@@ -17,7 +17,8 @@
           "severity": "warning",
           "short_name": "NewDeleteArrayMismatch",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -28,7 +29,8 @@
           "severity": "warning",
           "short_name": "NewArrayDeleteMismatch",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -90,7 +92,8 @@
           "short_name": "AssignmentOfEscapingAutoStorage",
           "shared_implementation_short_name": "DoNotCopyAddressOfAutoStorageObjectToOtherObject",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -116,7 +119,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -142,7 +146,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -160,7 +165,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -186,7 +192,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Functions.json b/rule_packages/cpp/Functions.json
index b650b0937..b62f4fe9a 100644
--- a/rule_packages/cpp/Functions.json
+++ b/rule_packages/cpp/Functions.json
@@ -41,7 +41,8 @@
           "severity": "recommendation",
           "short_name": "TrivialAccessorAndMutatorFunctionsNotInlined",
           "tags": [
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -65,7 +66,8 @@
           "short_name": "InvalidFunctionReturnType",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -236,7 +238,8 @@
           "shared_implementation_short_name": "ReturnReferenceOrPointerToAutomaticLocalVariable",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -311,7 +314,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -336,7 +340,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/IO.json b/rule_packages/cpp/IO.json
index 3d1012232..28b37e421 100644
--- a/rule_packages/cpp/IO.json
+++ b/rule_packages/cpp/IO.json
@@ -48,7 +48,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -73,7 +74,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/ImportMisra23.json b/rule_packages/cpp/ImportMisra23.json
index 243fc7cc2..7262cbcbe 100644
--- a/rule_packages/cpp/ImportMisra23.json
+++ b/rule_packages/cpp/ImportMisra23.json
@@ -38,7 +38,8 @@
           "shared_implementation_short_name": "OneDefinitionRuleViolation",
           "tags": [
             "correctness",
-            "scope/system"
+            "scope/system",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -118,7 +119,8 @@
           "shared_implementation_short_name": "RemoveConstOrVolatileQualification",
           "tags": [
             "correctness",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -141,7 +143,8 @@
           "tags": [
             "readability",
             "maintainability",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -298,7 +301,8 @@
           "tags": [
             "correctness",
             "readability",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -516,7 +520,8 @@
           "short_name": "CommaOperatorShouldNotBeUsed",
           "shared_implementation_short_name": "CommaOperatorUsed",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -701,7 +706,8 @@
           "short_name": "VirtualAndNonVirtualClassInTheHierarchy",
           "shared_implementation_short_name": "VirtualAndNonVirtualClassInTheHierarchy",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -764,7 +770,8 @@
           "short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor",
           "shared_implementation_short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor",
           "tags": [
-            "scope/system"
+            "scope/system",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -785,7 +792,8 @@
           "short_name": "InitializeAllVirtualBaseClasses",
           "shared_implementation_short_name": "InitializeAllVirtualBaseClasses",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -806,7 +814,8 @@
           "short_name": "InitializerListConstructorIsTheOnlyConstructor",
           "shared_implementation_short_name": "InitializerListConstructorIsTheOnlyConstructor",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -827,7 +836,8 @@
           "short_name": "AddressOfOperatorOverloaded",
           "shared_implementation_short_name": "AddressOfOperatorOverloaded",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -911,7 +921,8 @@
           "short_name": "NoexceptFunctionShouldNotPropagateToTheCaller",
           "shared_implementation_short_name": "NoexceptFunctionShouldNotPropagateToTheCaller",
           "tags": [
-            "scope/system"
+            "scope/system",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -1202,7 +1213,8 @@
           "short_name": "BackslashCharacterMisuse",
           "shared_implementation_short_name": "BackslashCharacterMisuse",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -1223,7 +1235,8 @@
           "short_name": "NonTerminatedEscapeSequences",
           "shared_implementation_short_name": "NonTerminatedEscapeSequences",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -1244,7 +1257,8 @@
           "short_name": "OctalConstantsUsed",
           "shared_implementation_short_name": "UseOfNonZeroOctalLiteral",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -1265,7 +1279,8 @@
           "short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed",
           "shared_implementation_short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -1286,7 +1301,8 @@
           "short_name": "LowercaseLStartsInLiteralSuffix",
           "shared_implementation_short_name": "LowercaseLStartsInLiteralSuffix",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -1581,7 +1597,8 @@
           "short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType",
           "shared_implementation_short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -1602,7 +1619,8 @@
           "short_name": "ReinterpretCastShallNotBeUsed",
           "shared_implementation_short_name": "ReinterpretCastUsed",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -1623,7 +1641,8 @@
           "short_name": "UnsignedOperationWithConstantOperandsWraps",
           "shared_implementation_short_name": "UnsignedOperationWithConstantOperandsWraps",
           "tags": [
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -1667,7 +1686,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -1681,7 +1701,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Includes.json b/rule_packages/cpp/Includes.json
index 1d7f97ed0..e0fff6921 100644
--- a/rule_packages/cpp/Includes.json
+++ b/rule_packages/cpp/Includes.json
@@ -45,7 +45,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -71,7 +72,8 @@
           "short_name": "HeaderFileExpectedFileNameExtension",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -97,7 +99,8 @@
           "short_name": "FileNameExtensionCpp",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "codingstandards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Inheritance.json b/rule_packages/cpp/Inheritance.json
index fc4805fc2..56b4b06dd 100644
--- a/rule_packages/cpp/Inheritance.json
+++ b/rule_packages/cpp/Inheritance.json
@@ -17,7 +17,9 @@
           "precision": "low",
           "severity": "recommendation",
           "short_name": "PublicInheritanceNotUsedForIsARelationship",
-          "tags": []
+          "tags": [
+            "codingstandards/baseline/style"
+          ]
         }
       ],
       "title": "Public inheritance shall be used to implement 'is-a' relationship."
@@ -146,7 +148,9 @@
           "severity": "warning",
           "short_name": "AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy",
           "shared_implementation_short_name": "VirtualAndNonVirtualClassInTheHierarchy",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "An accessible base class shall not be both virtual and non-virtual in the same hierarchy."
@@ -189,7 +193,9 @@
           "severity": "error",
           "short_name": "DynamicTypeOfThisUsedFromConstructorOrDestructor",
           "shared_implementation_short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "An object's dynamic type shall not be used from the body of its constructor or destructor."
@@ -234,7 +240,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -257,7 +264,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -280,7 +288,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p9",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Initialization.json b/rule_packages/cpp/Initialization.json
index e81160a27..525f70e36 100644
--- a/rule_packages/cpp/Initialization.json
+++ b/rule_packages/cpp/Initialization.json
@@ -92,7 +92,9 @@
           "short_name": "ConstructorWithFundamentalArgMissingExplicit",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -162,7 +164,8 @@
           "short_name": "MoveConstructorUsesCopySemantics",
           "tags": [
             "maintainability",
-            "performance"
+            "performance",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -308,7 +311,8 @@
           "shared_implementation_short_name": "InitializerListConstructorIsTheOnlyConstructor",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -422,7 +426,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -447,7 +452,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -475,7 +481,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Invariants.json b/rule_packages/cpp/Invariants.json
index 215e4edff..486d71965 100644
--- a/rule_packages/cpp/Invariants.json
+++ b/rule_packages/cpp/Invariants.json
@@ -92,7 +92,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -116,7 +117,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -132,7 +134,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Iterators.json b/rule_packages/cpp/Iterators.json
index c345adb37..48f82ad6c 100644
--- a/rule_packages/cpp/Iterators.json
+++ b/rule_packages/cpp/Iterators.json
@@ -16,7 +16,9 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "IteratorImplicitlyConvertedToConstIterator",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "An iterator shall not be implicitly converted to const_iterator."
@@ -66,7 +68,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -90,7 +93,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -114,7 +118,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -138,7 +143,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -163,7 +169,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Lambdas.json b/rule_packages/cpp/Lambdas.json
index 8f973c361..fc9cdc58c 100644
--- a/rule_packages/cpp/Lambdas.json
+++ b/rule_packages/cpp/Lambdas.json
@@ -17,7 +17,8 @@
           "severity": "warning",
           "short_name": "ImplicitLambdaCapture",
           "tags": [
-            "readability"
+            "readability",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -40,7 +41,8 @@
           "severity": "warning",
           "short_name": "LambdaExpressionWithoutParameterList",
           "tags": [
-            "readability"
+            "readability",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -158,7 +160,8 @@
           "severity": "recommendation",
           "short_name": "LambdaExpressionInLambdaExpression",
           "tags": [
-            "readability"
+            "readability",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -182,7 +185,8 @@
           "short_name": "IdenticalLambdaExpressions",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -228,7 +232,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Literals.json b/rule_packages/cpp/Literals.json
index 7721b7dd6..5dcb35cb3 100644
--- a/rule_packages/cpp/Literals.json
+++ b/rule_packages/cpp/Literals.json
@@ -16,7 +16,8 @@
           "severity": "recommendation",
           "short_name": "UseCorrectIntervalForDigitSequencesSeparators",
           "tags": [
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -41,7 +42,8 @@
           "short_name": "EscapeSequenceOutsideISO",
           "shared_implementation_short_name": "BackslashCharacterMisuse",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -146,7 +148,8 @@
           "severity": "recommendation",
           "short_name": "UseOfNonZeroOctalEscape",
           "tags": [
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -222,7 +225,8 @@
           "severity": "recommendation",
           "short_name": "NullUsedAsIntegerValue",
           "tags": [
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -244,7 +248,8 @@
           "severity": "recommendation",
           "short_name": "LiteralZeroUsedAsNullPointerConstant",
           "tags": [
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Loops.json b/rule_packages/cpp/Loops.json
index 39421074b..b1e500b11 100644
--- a/rule_packages/cpp/Loops.json
+++ b/rule_packages/cpp/Loops.json
@@ -17,7 +17,8 @@
           "severity": "recommendation",
           "short_name": "UnusedLoopCounterForContainerIteration",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -126,7 +127,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "NotEqualsInLoopCondition",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "If loop-counter is not modified by or ++, then, within condition, the loop-counter shall only be used as an operand to <=, <, > or >=."
@@ -147,7 +150,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "LoopCounterModifiedWithinCondition",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         },
         {
           "description": "The loop-counter shall not be modified within a statement.",
@@ -156,7 +161,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "LoopCounterModifiedWithinStatement",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "The loop-counter shall not be modified within condition or statement."
@@ -177,7 +184,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "IrregularLoopCounterModification",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "The loop-counter should be modified by one of: --, ++, -=n, or +=n, where n remains constant for the duration of the loop."
@@ -198,7 +207,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "LoopControlVariableModifiedInLoopCondition",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         },
         {
           "description": "A loop-control-variable other than the loop-counter shall not be modified within an expression.",
@@ -207,7 +218,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "LoopControlVariableModifiedInLoopExpression",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "A loop-control-variable other than the loop-counter shall not be modified within a condition or an expression."
diff --git a/rule_packages/cpp/Macros.json b/rule_packages/cpp/Macros.json
index 4ed3cf84b..5e244b0b3 100644
--- a/rule_packages/cpp/Macros.json
+++ b/rule_packages/cpp/Macros.json
@@ -43,7 +43,9 @@
                     "short_name": "CharactersOccurInHeaderFileNameOrInIncludeDirective",
                     "shared_implementation_short_name": "PreprocessorIncludesForbiddenHeaderNames",
                     "tags": [
-                        "correctness"
+                        "correctness",
+                        "coding-standards/baseline/safety",
+                        "coding-standards/baseline/style"
                     ],
                     "implementation_scope": {
                       "description": "This query identifies the use of the ', \\, /*, // characters in header file names. The query is not able to detect the use of the \" character in header file names.",
@@ -70,7 +72,8 @@
                     "severity": "warning",
                     "short_name": "ErrorDirectiveUsed",
                     "tags": [
-                        "readability"
+                        "readability",
+                        "coding-standards/baseline/style"
                     ]
                 }
             ],
@@ -118,7 +121,8 @@
                     "short_name": "IncludeDirectivesNotPrecededByDirectivesOrComments",
                     "shared_implementation_short_name": "PreprocessorIncludesPreceded",
                     "tags": [
-                        "readability"
+                        "readability",
+                        "coding-standards/baseline/safety"
                     ]
                 }
             ],
@@ -247,7 +251,8 @@
                     "severity": "error",
                     "short_name": "DefinedPreProcessorOperatorInOneOfTheTwoStandardForms",
                     "tags": [
-                        "correctness"
+                        "correctness",
+                        "coding-standards/baseline/safety"
                     ]
                 }
             ],
diff --git a/rule_packages/cpp/MoveForward.json b/rule_packages/cpp/MoveForward.json
index 6f071a6f5..5b726560c 100644
--- a/rule_packages/cpp/MoveForward.json
+++ b/rule_packages/cpp/MoveForward.json
@@ -42,7 +42,8 @@
           "short_name": "ForwardingValuesToOtherFunctions",
           "shared_implementation_short_name": "ForwardingReferencesAndForwardNotUsedTogether",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -65,7 +66,8 @@
           "severity": "error",
           "short_name": "MoveUsedOnConstObjects",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -87,7 +89,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ArgumentToForwardSubsequentlyUsed",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "An argument to std::forward shall not be subsequently used."
@@ -109,7 +113,8 @@
           "severity": "error",
           "short_name": "MoveFromConsumeParametersRvalRef",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -132,7 +137,8 @@
           "severity": "error",
           "short_name": "ForwardForwardingReferences",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -159,7 +165,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Naming.json b/rule_packages/cpp/Naming.json
index 34a9f2c66..8c26a8e24 100644
--- a/rule_packages/cpp/Naming.json
+++ b/rule_packages/cpp/Naming.json
@@ -177,7 +177,8 @@
           "short_name": "UniversalCharacterNamesUsedOutsideCharacterOrStringLiterals",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "codingstandards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Null.json b/rule_packages/cpp/Null.json
index 543552660..cfbd76084 100644
--- a/rule_packages/cpp/Null.json
+++ b/rule_packages/cpp/Null.json
@@ -18,7 +18,8 @@
           "short_name": "NullPointersDereferenced",
           "shared_implementation_short_name": "DereferenceOfNullPointer",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -68,7 +69,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/OperatorInvariants.json b/rule_packages/cpp/OperatorInvariants.json
index 5eaefd68c..99f319c89 100644
--- a/rule_packages/cpp/OperatorInvariants.json
+++ b/rule_packages/cpp/OperatorInvariants.json
@@ -64,7 +64,9 @@
           "severity": "error",
           "short_name": "AssignmentOperatorReturnThis",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -110,7 +112,8 @@
           "severity": "recommendation",
           "short_name": "OppositeOperatorsNotDefinedInTermsOfOther",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -182,7 +185,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -206,7 +210,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p9",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Operators.json b/rule_packages/cpp/Operators.json
index 76be8a732..d9c1c00b6 100644
--- a/rule_packages/cpp/Operators.json
+++ b/rule_packages/cpp/Operators.json
@@ -17,7 +17,8 @@
           "severity": "error",
           "short_name": "UserDefinedAssignmentOperatorVirtual",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -149,7 +150,9 @@
           "severity": "error",
           "short_name": "UserDefinedConversionOperatorsNotDefinedExplicit",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -255,7 +258,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CommaOperatorAndOperatorAndTheOperatorOverloaded",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "The comma operator, && operator and the || operator shall not be overloaded."
@@ -298,7 +303,9 @@
           "severity": "error",
           "short_name": "UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned",
           "shared_implementation_short_name": "BuiltInUnaryOperatorAppliedToUnsignedExpression",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "The unary minus operator shall not be applied to an expression whose underlying type is unsigned."
@@ -320,7 +327,9 @@
           "severity": "error",
           "short_name": "UnaryOperatorOverloaded",
           "shared_implementation_short_name": "AddressOfOperatorOverloaded",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "The unary & operator shall not be overloaded."
diff --git a/rule_packages/cpp/OrderOfEvaluation.json b/rule_packages/cpp/OrderOfEvaluation.json
index 00ec0dbc6..eb49543f5 100644
--- a/rule_packages/cpp/OrderOfEvaluation.json
+++ b/rule_packages/cpp/OrderOfEvaluation.json
@@ -64,7 +64,8 @@
           "severity": "warning",
           "short_name": "ExplicitConstructionOfUnnamedTemporary",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -124,7 +125,9 @@
           "short_name": "IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression",
           "tags": [
             "readability",
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -147,7 +150,8 @@
           "severity": "warning",
           "short_name": "AssignmentInSubExpression",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/OutOfBounds.json b/rule_packages/cpp/OutOfBounds.json
index 2a657df95..9bfdc29bc 100644
--- a/rule_packages/cpp/OutOfBounds.json
+++ b/rule_packages/cpp/OutOfBounds.json
@@ -72,7 +72,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -97,7 +98,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Pointers.json b/rule_packages/cpp/Pointers.json
index fb1fbe291..50e44efda 100644
--- a/rule_packages/cpp/Pointers.json
+++ b/rule_packages/cpp/Pointers.json
@@ -17,7 +17,8 @@
           "severity": "error",
           "short_name": "PointerToAnElementOfAnArrayPassedToASmartPointer",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -42,7 +43,8 @@
           "shared_implementation_short_name": "DoNotUseMoreThanTwoLevelsOfPointerIndirection",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -113,7 +115,8 @@
           "short_name": "DeletingPointerToIncompleteType",
           "shared_implementation_short_name": "DeleteOfPointerToIncompleteClass",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -137,7 +140,8 @@
           "short_name": "PointerToMemberAccessNonExistentClassMembers",
           "shared_implementation_short_name": "AccessOfNonExistingMemberThroughPointerToMember",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -161,7 +165,8 @@
           "short_name": "UninitializedStaticPointerToMemberUse",
           "shared_implementation_short_name": "AccessOfUndefinedMemberThroughUninitializedStaticPointer",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -210,7 +215,8 @@
           "short_name": "PointerAndDerivedPointerAccessDifferentArray",
           "shared_implementation_short_name": "DoNotUsePointerArithmeticToAddressDifferentArrays",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -234,7 +240,8 @@
           "short_name": "PointerSubtractionOnDifferentArrays",
           "shared_implementation_short_name": "DoNotSubtractPointersAddressingDifferentArrays",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -305,7 +312,8 @@
           "severity": "error",
           "short_name": "PointerToAVirtualBaseClassCastToAPointer",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -401,7 +409,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p9",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -426,7 +435,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -467,7 +477,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -484,7 +495,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -501,7 +513,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Representation.json b/rule_packages/cpp/Representation.json
index 813373afb..bf2eaf183 100644
--- a/rule_packages/cpp/Representation.json
+++ b/rule_packages/cpp/Representation.json
@@ -86,7 +86,8 @@
           "severity": "error",
           "short_name": "UnderlyingBitRepresentationsOfFloatingPointValuesUsed",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -136,7 +137,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -153,7 +155,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -169,7 +172,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Scope.json b/rule_packages/cpp/Scope.json
index 6fc3aa848..242c217b2 100644
--- a/rule_packages/cpp/Scope.json
+++ b/rule_packages/cpp/Scope.json
@@ -42,7 +42,8 @@
           "severity": "warning",
           "short_name": "ExternalLinkageArrayWithoutExplicitSize",
           "tags": [
-            "correctness"
+            "correctness",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -114,7 +115,8 @@
           "short_name": "OneDefinitionRuleViolation",
           "shared_implementation_short_name": "OneDefinitionRuleViolation",
           "tags": [
-            "correctness"
+            "correctness",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -185,7 +187,8 @@
           "short_name": "MissingStaticSpecifierOnFunctionRedeclaration",
           "shared_implementation_short_name": "MissingStaticSpecifierFunctionRedeclarationShared",
           "tags": [
-            "readability"
+            "readability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -259,7 +262,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "codingstandards/baseline/style"
           ]
         },
         {
@@ -275,7 +279,9 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -299,7 +305,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/low",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -324,7 +331,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "codingstandards/baseline/style"
           ]
         }
       ],
@@ -348,7 +356,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "codingstandards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/SmartPointers1.json b/rule_packages/cpp/SmartPointers1.json
index ea062b5a7..ebbde0f15 100644
--- a/rule_packages/cpp/SmartPointers1.json
+++ b/rule_packages/cpp/SmartPointers1.json
@@ -38,7 +38,10 @@
           "precision": "high",
           "severity": "warning",
           "short_name": "UniquePtrNotUsedToRepresentExclusiveOwnership",
-          "tags": ["maintainability"]
+          "tags": [
+            "maintainability",
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "A std::unique_ptr shall be used to represent exclusive ownership."
diff --git a/rule_packages/cpp/Strings.json b/rule_packages/cpp/Strings.json
index acccdc775..18654684c 100644
--- a/rule_packages/cpp/Strings.json
+++ b/rule_packages/cpp/Strings.json
@@ -18,7 +18,9 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "StringLiteralsAssignedToNonConstantPointers",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/safety"
+          ]
         }
       ],
       "title": "String literals shall not be assigned to non-constant pointers."
@@ -138,7 +140,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -154,7 +157,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Templates.json b/rule_packages/cpp/Templates.json
index a6520a778..3c5ae351d 100644
--- a/rule_packages/cpp/Templates.json
+++ b/rule_packages/cpp/Templates.json
@@ -43,7 +43,8 @@
           "short_name": "TemplateConstructorOverloadResolution",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -90,7 +91,8 @@
           "short_name": "TemplateSpecializationNotDeclaredInTheSameFile",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -150,7 +152,8 @@
           "short_name": "CopyAssignmentOperatorNotDeclared",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Toolchain.json b/rule_packages/cpp/Toolchain.json
index 251bd9cf0..8fdc0ff5f 100644
--- a/rule_packages/cpp/Toolchain.json
+++ b/rule_packages/cpp/Toolchain.json
@@ -65,7 +65,8 @@
           "severity": "warning",
           "short_name": "IncrementOperatorWithBoolOperandIsDeprecated",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -76,7 +77,8 @@
           "severity": "warning",
           "short_name": "RegisterKeywordIsDeprecated",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -87,7 +89,8 @@
           "severity": "warning",
           "short_name": "ImplicitCopyConstructorIsDeprecated",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -98,7 +101,8 @@
           "severity": "warning",
           "short_name": "ImplicitCopyAssignmentOperatorIsDeprecated",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -109,7 +113,8 @@
           "severity": "warning",
           "short_name": "DynamicExceptionsAreDeprecated",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -120,7 +125,8 @@
           "severity": "warning",
           "short_name": "CStandardLibraryHeadersAreDeprecated",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -131,7 +137,8 @@
           "severity": "warning",
           "short_name": "StrstreamTypesAreDeprecated",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/TypeRanges.json b/rule_packages/cpp/TypeRanges.json
index 1e8ef914b..f9ae04efe 100644
--- a/rule_packages/cpp/TypeRanges.json
+++ b/rule_packages/cpp/TypeRanges.json
@@ -42,7 +42,8 @@
           "shared_implementation_short_name": "StringNumberConversionMissingErrorCheck",
           "short_name": "StringNumberConversionMissingErrorCheck",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -53,7 +54,8 @@
           "severity": "warning",
           "short_name": "UseOfUnsafeCStringToNumberConversion",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -76,7 +78,8 @@
           "severity": "error",
           "short_name": "SignedValPassedToChar",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -162,7 +165,8 @@
           "short_name": "IntegerUsedForEnum",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -189,7 +193,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Uninitialized.json b/rule_packages/cpp/Uninitialized.json
index 1432e1160..07edc261c 100644
--- a/rule_packages/cpp/Uninitialized.json
+++ b/rule_packages/cpp/Uninitialized.json
@@ -75,7 +75,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p12",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/VirtualFunctions.json b/rule_packages/cpp/VirtualFunctions.json
index eff4e15be..d4b523aa0 100644
--- a/rule_packages/cpp/VirtualFunctions.json
+++ b/rule_packages/cpp/VirtualFunctions.json
@@ -109,7 +109,8 @@
           "severity": "warning",
           "short_name": "DestructorOfABaseClassNotPublicVirtual",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -155,7 +156,8 @@
           "severity": "recommendation",
           "short_name": "VirtualFunctionOverriddenByAPureVirtualFunction",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -179,7 +181,8 @@
           "short_name": "VirtualFunctionParametersUseTheSameDefaultArguments",
           "shared_implementation_short_name": "OverridingShallSpecifyDifferentDefaultArguments",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/style"
           ]
         }
       ],

From efd677554a14c75ce0f46854767d2127a223b6c0 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 4 Dec 2025 14:46:24 -0800
Subject: [PATCH 04/10] Add baseline suites tags to rule package json schema

---
 schemas/rule-package.schema.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/schemas/rule-package.schema.json b/schemas/rule-package.schema.json
index fff79fede..73531cfac 100644
--- a/schemas/rule-package.schema.json
+++ b/schemas/rule-package.schema.json
@@ -370,7 +370,9 @@
                             "external/cert/priority/p27",
                             "external/cert/level/l1",
                             "external/cert/level/l2",
-                            "external/cert/level/l3"
+                            "external/cert/level/l3",
+                            "coding-standards/baseline/safety",
+                            "coding-standards/baseline/style"
                         ]
                     },
                     "minLength": 1

From 0478f198464882a36b0bb1ed2ee980505ff011c5 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 4 Dec 2025 17:39:35 -0800
Subject: [PATCH 05/10] Fix json syntax error, type in baseline query tags

---
 rule_packages/cpp/BannedAPIs.json         |  4 ++--
 rule_packages/cpp/BannedFunctions.json    |  4 ++--
 rule_packages/cpp/BannedSyntax.json       | 10 +++++-----
 rule_packages/cpp/Classes.json            |  4 ++--
 rule_packages/cpp/Comments.json           |  2 +-
 rule_packages/cpp/Includes.json           |  4 ++--
 rule_packages/cpp/Inheritance.json        |  2 +-
 rule_packages/cpp/Lambdas.json            |  8 ++++----
 rule_packages/cpp/Loops.json              |  2 +-
 rule_packages/cpp/Naming.json             |  2 +-
 rule_packages/cpp/OperatorInvariants.json |  2 +-
 rule_packages/cpp/Operators.json          |  2 +-
 rule_packages/cpp/Pointers.json           |  1 -
 rule_packages/cpp/Scope.json              | 12 ++++++------
 14 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/rule_packages/cpp/BannedAPIs.json b/rule_packages/cpp/BannedAPIs.json
index 936df4c3a..89d22581f 100644
--- a/rule_packages/cpp/BannedAPIs.json
+++ b/rule_packages/cpp/BannedAPIs.json
@@ -17,7 +17,7 @@
             "scope/single-translation-unit",
             "maintainability",
             "correctness",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -129,7 +129,7 @@
             "scope/single-translation-unit",
             "correctness",
             "maintainability",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/BannedFunctions.json b/rule_packages/cpp/BannedFunctions.json
index 906e623f3..b85f7fc66 100644
--- a/rule_packages/cpp/BannedFunctions.json
+++ b/rule_packages/cpp/BannedFunctions.json
@@ -68,7 +68,7 @@
           "tags": [
             "security",
             "scope/single-translation-unit",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -226,7 +226,7 @@
             "external/cert/priority/p4",
             "external/cert/level/l3",
             "coding-standards/baseline/safety",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/BannedSyntax.json b/rule_packages/cpp/BannedSyntax.json
index 06355ff03..2efb798d0 100644
--- a/rule_packages/cpp/BannedSyntax.json
+++ b/rule_packages/cpp/BannedSyntax.json
@@ -200,7 +200,7 @@
             "correctness",
             "security",
             "scope/single-translation-unit",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -225,7 +225,7 @@
           "tags": [
             "correctness",
             "scope/single-translation-unit",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -349,7 +349,7 @@
           "tags": [
             "correctness",
             "scope/single-translation-unit",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -398,7 +398,7 @@
           "tags": [
             "correctness",
             "scope/single-translation-unit",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -427,7 +427,7 @@
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p12",
             "external/cert/level/l1",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Classes.json b/rule_packages/cpp/Classes.json
index 92bc3ff56..e925ecfc4 100644
--- a/rule_packages/cpp/Classes.json
+++ b/rule_packages/cpp/Classes.json
@@ -119,7 +119,7 @@
           "severity": "recommendation",
           "short_name": "ClassDataMembersInitializationCondition",
           "tags": [
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -189,7 +189,7 @@
           "short_name": "NonTrivialNonTemplateFunctionDefinedInsideClassDefinition",
           "tags": [
             "external/autosar/audit",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Comments.json b/rule_packages/cpp/Comments.json
index 02d257223..0001818a4 100644
--- a/rule_packages/cpp/Comments.json
+++ b/rule_packages/cpp/Comments.json
@@ -22,7 +22,7 @@
             "readability",
             "maintainability",
             "coding-standards/baseline/safety",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Includes.json b/rule_packages/cpp/Includes.json
index e0fff6921..b098f47ea 100644
--- a/rule_packages/cpp/Includes.json
+++ b/rule_packages/cpp/Includes.json
@@ -73,7 +73,7 @@
           "tags": [
             "maintainability",
             "readability",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -100,7 +100,7 @@
           "tags": [
             "maintainability",
             "readability",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Inheritance.json b/rule_packages/cpp/Inheritance.json
index 56b4b06dd..823266407 100644
--- a/rule_packages/cpp/Inheritance.json
+++ b/rule_packages/cpp/Inheritance.json
@@ -18,7 +18,7 @@
           "severity": "recommendation",
           "short_name": "PublicInheritanceNotUsedForIsARelationship",
           "tags": [
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Lambdas.json b/rule_packages/cpp/Lambdas.json
index fc9cdc58c..d488ce391 100644
--- a/rule_packages/cpp/Lambdas.json
+++ b/rule_packages/cpp/Lambdas.json
@@ -18,7 +18,7 @@
           "short_name": "ImplicitLambdaCapture",
           "tags": [
             "readability",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -42,7 +42,7 @@
           "short_name": "LambdaExpressionWithoutParameterList",
           "tags": [
             "readability",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -161,7 +161,7 @@
           "short_name": "LambdaExpressionInLambdaExpression",
           "tags": [
             "readability",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -186,7 +186,7 @@
           "tags": [
             "readability",
             "maintainability",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Loops.json b/rule_packages/cpp/Loops.json
index b1e500b11..1dddf9fee 100644
--- a/rule_packages/cpp/Loops.json
+++ b/rule_packages/cpp/Loops.json
@@ -18,7 +18,7 @@
           "short_name": "UnusedLoopCounterForContainerIteration",
           "tags": [
             "maintainability",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Naming.json b/rule_packages/cpp/Naming.json
index 8c26a8e24..423819f02 100644
--- a/rule_packages/cpp/Naming.json
+++ b/rule_packages/cpp/Naming.json
@@ -178,7 +178,7 @@
           "tags": [
             "maintainability",
             "readability",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/OperatorInvariants.json b/rule_packages/cpp/OperatorInvariants.json
index 99f319c89..e8780b120 100644
--- a/rule_packages/cpp/OperatorInvariants.json
+++ b/rule_packages/cpp/OperatorInvariants.json
@@ -66,7 +66,7 @@
           "tags": [
             "correctness",
             "coding-standards/baseline/safety",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Operators.json b/rule_packages/cpp/Operators.json
index d9c1c00b6..5ab17abe4 100644
--- a/rule_packages/cpp/Operators.json
+++ b/rule_packages/cpp/Operators.json
@@ -152,7 +152,7 @@
           "tags": [
             "correctness",
             "coding-standards/baseline/safety",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Pointers.json b/rule_packages/cpp/Pointers.json
index 44d51ecf3..4591711d0 100644
--- a/rule_packages/cpp/Pointers.json
+++ b/rule_packages/cpp/Pointers.json
@@ -515,7 +515,6 @@
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
             "coding-standards/baseline/safety"
-            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Scope.json b/rule_packages/cpp/Scope.json
index 242c217b2..f612072b9 100644
--- a/rule_packages/cpp/Scope.json
+++ b/rule_packages/cpp/Scope.json
@@ -43,7 +43,7 @@
           "short_name": "ExternalLinkageArrayWithoutExplicitSize",
           "tags": [
             "correctness",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -116,7 +116,7 @@
           "shared_implementation_short_name": "OneDefinitionRuleViolation",
           "tags": [
             "correctness",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -263,7 +263,7 @@
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p2",
             "external/cert/level/l3",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         },
         {
@@ -281,7 +281,7 @@
             "external/cert/priority/p2",
             "external/cert/level/l3",
             "coding-standards/baseline/safety",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -332,7 +332,7 @@
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
             "external/cert/level/l2",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -357,7 +357,7 @@
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
             "external/cert/level/l3",
-            "codingstandards/baseline/style"
+            "coding-standards/baseline/style"
           ]
         }
       ],

From 0c752e8a78e1db2fc8ef409767843a9c6c71068a Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 4 Dec 2025 17:41:58 -0800
Subject: [PATCH 06/10] Re-add errantly removed cert level tag in pointers.json

---
 rule_packages/cpp/Pointers.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rule_packages/cpp/Pointers.json b/rule_packages/cpp/Pointers.json
index 4591711d0..5840d8d18 100644
--- a/rule_packages/cpp/Pointers.json
+++ b/rule_packages/cpp/Pointers.json
@@ -514,6 +514,7 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
+            "external/cert/level/l2",
             "coding-standards/baseline/safety"
           ]
         }

From e66e86abbdf1403093cbde20782444e36e35ba99 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 5 Dec 2025 13:36:09 -0800
Subject: [PATCH 07/10] Fix tags; reorder & rule_package consistency.

---
 .../VariableLengthArraySizeNotInValidRange.ql |  2 +-
 ...atePointersThatDoNotReferToTheSameArray.ql |  2 +-
 .../CON30-C/CleanUpThreadSpecificStorage.ql   |  2 +-
 ...NotAllowAMutexToGoOutOfScopeWhileLocked.ql |  2 +-
 .../DoNotDestroyAMutexWhileItIsLocked.ql      |  2 +-
 .../PreventDataRacesWithMultipleThreads.ql    |  2 +-
 ...RaceConditionsWhenUsingLibraryFunctions.ql |  2 +-
 ...pFunctionsThatCanSpuriouslyWakeUpInLoop.ql |  2 +-
 ...eserveSafetyWhenUsingConditionVariables.ql |  2 +-
 .../ThreadWasPreviouslyJoinedOrDetached.ql    |  2 +-
 .../AtomicVariableTwiceInExpression.ql        |  2 +-
 ...rapFunctionsThatCanFailSpuriouslyInLoop.ql |  2 +-
 ...propriateStorageDurationsFunctionReturn.ql |  2 +-
 .../DCL38-C/DeclaringAFlexibleArrayMember.ql  |  2 +-
 .../DCL41-C/VariablesInsideSwitchStatement.ql |  2 +-
 ...tModifyTheReturnValueOfCertainFunctions.ql |  2 +-
 ...vPointerIsInvalidAfterCertainOperations.ql |  2 +-
 .../ENV32-C/ExitHandlersMustReturnNormally.ql |  2 +-
 ...oNotStorePointersReturnedByEnvFunctions.ql |  2 +-
 ...orePointersReturnedByEnvironmentFunWarn.ql |  2 +-
 .../rules/ERR30-C/ErrnoReadBeforeReturn.ql    |  2 +-
 .../rules/ERR30-C/SetlocaleMightSetErrno.ql   |  2 +-
 .../DoNotRelyOnIndeterminateValuesOfErrno.ql  |  2 +-
 ...sVolatileObjectWithNonVolatileReference.ql |  2 +-
 ...DoNotModifyObjectsWithTemporaryLifetime.ql |  2 +-
 ...CallFunctionPointerWithIncompatibleType.ql |  2 +-
 ...tCallFunctionsWithIncompatibleArguments.ql |  2 +-
 .../EXP40-C/DoNotModifyConstantObjects.ql     |  2 +-
 ...sAliasedPointerToRestrictQualifiedParam.ql |  2 +-
 ...trictPointerReferencesOverlappingObject.ql |  2 +-
 ...ABitwiseOperatorWithABooleanLikeOperand.ql |  2 +-
 .../ExcludeUserInputFromFormatStrings.ql      |  2 +-
 ...sfulFgetsOrFgetwsMayReturnAnEmptyString.ql |  2 +-
 .../src/rules/FIO38-C/DoNotCopyAFileObject.ql |  2 +-
 ...ernatelyIOFromAStreamWithoutPositioning.ql |  2 +-
 .../ResetStringsOnFgetsOrFgetwsFailure.ql     |  2 +-
 .../DoNotCallGetcAndPutcWithSideEffects.ql    |  2 +-
 ...ToctouRaceConditionsWhileAccessingFiles.ql |  2 +-
 .../UndefinedBehaviorAccessingAClosedFile.ql  |  2 +-
 .../src/rules/FIO47-C/UseValidSpecifiers.ql   |  2 +-
 .../FLP30-C/FloatingPointLoopCounters.ql      |  2 +-
 .../FLP37-C/MemcmpUsedToCompareFloats.ql      |  2 +-
 .../INT35-C/UseCorrectIntegerPrecisions.ql    |  2 +-
 .../rules/MEM30-C/DoNotAccessFreedMemory.ql   |  2 +-
 ...uctsWithAFlexibleArrayMemberDynamically.ql |  2 +-
 ...uctsWithAFlexibleArrayMemberDynamically.ql |  2 +-
 ...DoNotModifyAlignmentOfMemoryWithRealloc.ql |  2 +-
 ...andUsedForGeneratingPseudorandomNumbers.ql |  2 +-
 ...roperlySeedPseudorandomNumberGenerators.ql |  2 +-
 ...oNotPassInvalidDataToTheAsctimeFunction.ql |  2 +-
 ...ArgOnAVaListThatHasAnIndeterminateValue.ql |  2 +-
 .../DoNotViolateInLineLinkageConstraints.ql   |  2 +-
 .../SideEffectsInArgumentsToUnsafeMacros.ql   |  2 +-
 .../MacroOrFunctionArgsContainHashToken.ql    |  2 +-
 ...yAsyncSafeFunctionsWithinSignalHandlers.ql |  2 +-
 ...llSignalFromInterruptibleSignalHandlers.ql |  2 +-
 ...eturnFromAComputationalExceptionHandler.ql |  2 +-
 .../DoNotAttemptToModifyStringLiterals.ql     |  2 +-
 ...sHasSufficientSpaceForTheNullTerminator.ql |  2 +-
 ...erHandlingFunctionsRepresentableAsUChar.ql |  2 +-
 .../DoNotConfuseNarrowAndWideFunctions.ql     |  2 +-
 .../PrecautionIncludeGuardsNotProvided.ql     |  2 +-
 .../SectionsOfCodeShallNotBeCommentedOut.ql   |  2 +-
 ...dentifiersInTheSameNameSpaceUnambiguous.ql |  2 +-
 .../DIR-4-9/FunctionOverFunctionLikeMacro.ql  |  2 +-
 .../DIR-5-2/NotNoDeadlocksBetweenThreads.ql   |  2 +-
 .../RULE-1-5/CallToObsolescentFunctionGets.ql |  2 +-
 ...FunctionTypesNotInPrototypeFormObsolete.ql |  2 +-
 .../InvalidDefineOrUndefOfStdBoolMacro.ql     |  2 +-
 ...taticSpecifierFuncRedeclarationObsolete.ql |  2 +-
 ...ticSpecifierObjectRedeclarationObsolete.ql |  2 +-
 .../rules/RULE-1-5/SizeInReallocCallIsZero.ql |  2 +-
 .../UseOfObsoleteMacroAtomicVarInit.ql        |  2 +-
 .../AtomicQualifierAppliedToVoid.ql           |  2 +-
 ...etweenIncompleteTypePointerAndOtherType.ql |  2 +-
 ...nPointerToObjectAndNonIntArithmeticType.ql |  2 +-
 ...NullNotUsedAsIntegerNullPointerConstant.ql |  2 +-
 .../RULE-12-3/CommaOperatorShouldNotBeUsed.ql |  2 +-
 ...antUnsignedIntegerExpressionsWrapAround.ql |  2 +-
 .../SizeofOperatorUsedOnArrayTypeParam.ql     |  2 +-
 .../AtomicAggregateObjectDirectlyAccessed.ql  |  2 +-
 ...alizerListsContainPersistentSideEffects.ql |  2 +-
 .../rules/RULE-13-2/UnsequencedAtomicReads.ql |  2 +-
 .../rules/RULE-13-2/UnsequencedSideEffects.ql |  2 +-
 ...ltOfAnAssignmentOperatorShouldNotBeUsed.ql |  2 +-
 .../RULE-13-6/SizeofOperandWithSideEffect.ql  |  2 +-
 .../RULE-14-1/LoopOverEssentiallyFloatType.ql |  2 +-
 .../RULE-14-3/ControllingExprInvariant.ql     |  2 +-
 .../src/rules/RULE-15-1/GotoStatementUsed.ql  |  2 +-
 .../RULE-15-2/GotoLabelLocationCondition.ql   |  4 +-
 .../RULE-15-3/GotoLabelBlockCondition.ql      |  2 +-
 .../rules/RULE-15-6/LoopCompoundCondition.ql  |  2 +-
 .../RULE-15-6/SelectionCompoundCondition.ql   |  4 +-
 .../RULE-15-6/SwitchCompoundCondition.ql      |  2 +-
 .../RULE-16-1/SwitchCaseStartCondition.ql     |  2 +-
 .../RULE-16-1/SwitchStmtNotWellFormed.ql      |  2 +-
 .../NestSwitchLabelInSwitchStatement.ql       |  2 +-
 .../DefaultNotFirstOrLastOfSwitch.ql          |  2 +-
 .../RULE-16-6/SwitchClauseNumberCondition.ql  |  2 +-
 ...onWithNoReturningBranchShouldBeNoreturn.ql |  2 +-
 .../RULE-17-3/FunctionDeclaredImplicitly.ql   |  2 +-
 .../NonVoidFunctionReturnCondition.ql         |  4 +-
 .../ArrayFunctionArgumentNumberOfElements.ql  |  4 +-
 .../src/rules/RULE-17-6/UseOfArrayStatic.ql   |  2 +-
 .../ReturnStatementInNoreturnFunction.ql      |  2 +-
 ...ointersToVariablyModifiedArrayTypesUsed.ql |  2 +-
 ...TwoLevelsOfPointerNestingInDeclarations.ql |  2 +-
 ...StorageObjectAddressCopiedToOtherObject.ql |  2 +-
 ...dLocalObjectAddressCopiedToGlobalObject.ql |  2 +-
 .../RULE-18-7/FlexibleArrayMembersDeclared.ql |  4 +-
 .../RULE-18-8/VariableLengthArrayTypesUsed.ql |  4 +-
 ...rayToPointerConversionOfTemporaryObject.ql |  2 +-
 ...eLValueSubscriptedWithTemporaryLifetime.ql |  2 +-
 .../ObjectAssignedToAnOverlappingObject.ql    |  2 +-
 .../ObjectCopiedToAnOverlappingObject.ql      |  2 +-
 c/misra/src/rules/RULE-2-1/UnreachableCode.ql |  2 +-
 c/misra/src/rules/RULE-2-2/DeadCode.ql        |  2 +-
 .../rules/RULE-2-3/UnusedTypeDeclarations.ql  |  2 +-
 .../rules/RULE-2-5/UnusedMacroDeclaration.ql  |  2 +-
 .../rules/RULE-2-6/UnusedLabelDeclaration.ql  |  2 +-
 .../rules/RULE-2-8/UnusedObjectDefinition.ql  |  2 +-
 ...irectivesPrecededByDirectivesOrComments.ql |  2 +-
 ...oreThanOneHashOperatorInMacroDefinition.ql |  2 +-
 .../ForbiddenCharactersInHeaderFileName.ql    |  2 +-
 .../MacroDefinedWithTheSameNameAsKeyword.ql   |  2 +-
 .../rules/RULE-20-5/UndefShouldNotBeUsed.ql   |  2 +-
 ...tionLikeMacroArgsContainHashTokenCQuery.ql |  2 +-
 ...IdentifiersUsedInPreprocessorExpression.ql |  2 +-
 .../CtypeFunctionArgNotUnsignedCharOrEof.ql   |  2 +-
 ...emcmpUsedToCompareNullTerminatedStrings.ql |  2 +-
 ...veMemcmpArgNotPointersToCompatibleTypes.ql |  2 +-
 ...tringFunctionPointerArgumentOutOfBounds.ql |  2 +-
 .../StringLibrarySizeArgumentOutOfBounds.ql   |  2 +-
 ...ReturnedByLocaleSettingUsedAsPtrToConst.ql |  2 +-
 .../CallToSetlocaleInvalidatesOldPointers.ql  |  2 +-
 ...llToSetlocaleInvalidatesOldPointersWarn.ql |  2 +-
 ...gMathArgumentsWithDifferingStandardType.ql |  2 +-
 .../RULE-21-24/CallToBannedRandomFunction.ql  |  2 +-
 .../TimedlockOnInappropriateMutexType.ql      |  2 +-
 .../StandardHeaderFileUsedSetjmph.ql          |  2 +-
 .../AtofAtoiAtolAndAtollOfStdlibhUsed.ql      |  2 +-
 .../CloseFileHandleWhenNoLongerNeededMisra.ql |  2 +-
 .../FreeMemoryWhenNoLongerNeededMisra.ql      |  2 +-
 ...TestErrnoRightAfterErrnoSettingFunction.ql |  2 +-
 .../ThreadPreviouslyJoinedOrDetached.ql       |  2 +-
 .../MutexInitWithInvalidMutexType.ql          |  2 +-
 .../MutexObjectsNotAlwaysUnlocked.ql          |  2 +-
 .../InvalidOperationOnUnlockedMutex.ql        |  2 +-
 ...onditionVariableUsedWithMultipleMutexes.ql |  2 +-
 ...OnlyFreeMemoryAllocatedDynamicallyMisra.ql |  2 +-
 .../ThreadStorageNotInitializedBeforeUse.ql   |  2 +-
 ...leOpenForReadAndWriteOnDifferentStreams.ql |  2 +-
 .../AttemptToWriteToAReadOnlyStream.ql        |  2 +-
 .../PointerToAFileObjectDereferenced.ql       |  2 +-
 .../rules/RULE-22-6/FileUsedAfterClosed.ql    |  2 +-
 ...allBeComparedWithUnmodifiedReturnValues.ql |  2 +-
 .../RULE-22-8/ErrnoSetToZeroPriorToCall.ql    |  2 +-
 .../RULE-22-9/ErrnoSetToZeroAfterCall.ql      |  2 +-
 ...ricSelectionDoesntDependOnMacroArgument.ql |  2 +-
 .../GenericSelectionNotExpandedFromAMacro.ql  |  2 +-
 ...ricSelectionNotFromMacroWithSideEffects.ql |  2 +-
 .../GenericWithoutNonDefaultAssociation.ql    |  2 +-
 .../GenericAssociationWithUnselectableType.ql |  2 +-
 ...rousDefaultSelectionForPointerInGeneric.ql |  2 +-
 .../InvalidGenericMacroArgumentEvaluation.ql  |  2 +-
 .../DefaultGenericSelectionNotFirstOrLast.ql  |  2 +-
 .../RULE-3-2/LineSplicingUsedInComments.ql    |  4 +-
 ...HexadecimalEscapeSequencesNotTerminated.ql |  2 +-
 .../ExternalIdentifiersNotDistinct.ql         |  2 +-
 ...ifiersDeclaredInTheSameScopeNotDistinct.ql |  2 +-
 ...MacroIdentifierNotDistinctFromParameter.ql |  2 +-
 .../SingleBitNamedBitFieldsOfASignedType.ql   |  2 +-
 .../BitFieldDeclaredAsMemberOfAUnion.ql       |  2 +-
 .../UseOfBannedSmallIntegerConstantMacro.ql   |  2 +-
 .../rules/RULE-8-1/ExplicitlyDeclareTypes.ql  |  2 +-
 .../InlineFunctionNotDeclaredStaticStorage.ql |  2 +-
 ...lueImplicitEnumerationConstantNotUnique.ql |  2 +-
 .../RULE-8-14/RestrictTypeQualifierUsed.ql    |  2 +-
 ...clarationOfObjectWithUnmatchedAlignment.ql |  2 +-
 .../RedeclarationOfObjectWithoutAlignment.ql  |  2 +-
 .../rules/RULE-8-16/AlignmentWithSizeZero.ql  |  2 +-
 ...eThanOneAlignmentSpecifierOnDeclaration.ql |  2 +-
 .../FunctionTypesNotInPrototypeForm.ql        |  2 +-
 ...ngStaticSpecifierFunctionRedeclarationC.ql |  2 +-
 ...singStaticSpecifierObjectRedeclarationC.ql |  2 +-
 ...ctWithAutoStorageDurationReadBeforeInit.ql |  2 +-
 ...rForAggregateOrUnionNotEnclosedInBraces.ql |  2 +-
 ...nitializedArrayWithExplicitInitializers.ql |  2 +-
 ...dInitializationOfAggregateObjectElement.ql |  2 +-
 .../RULE-9-7/UninitializedAtomicObject.ql     |  2 +-
 .../src/rules/A0-1-1/UselessAssignment.ql     |  2 +-
 .../CStandardLibraryHeadersAreDeprecated.ql   |  2 +-
 ...vedFromMoreThanOneNonInterfaceBaseClass.ql |  2 +-
 .../UserDefinedAssignmentOperatorVirtual.ql   |  2 +-
 ...ructorWithFundamentalArgMissingExplicit.ql |  4 +-
 .../DestructorOfABaseClassNotPublicVirtual.ql |  2 +-
 ...ClassDataMembersInitializationCondition.ql |  2 +-
 .../MoveConstructorUsesCopySemantics.ql       |  2 +-
 .../A13-2-1/AssignmentOperatorReturnThis.ql   |  4 +-
 ...edConversionOperatorsNotDefinedExplicit.ql |  4 +-
 ...positeOperatorsNotDefinedInTermsOfOther.ql |  2 +-
 ...rectIntervalForDigitSequencesSeparators.ql |  2 +-
 .../TemplateConstructorOverloadResolution.ql  |  2 +-
 ...eSpecializationNotDeclaredInTheSameFile.ql |  2 +-
 .../OnlyThrowStdExceptionDerivedTypes.ql      |  2 +-
 .../rules/A15-1-2/PointerExceptionObject.ql   |  2 +-
 ...structorErrorLeavesObjectInInvalidState.ql |  2 +-
 .../A15-3-3/MissingCatchHandlerInMain.ql      |  2 +-
 .../A15-3-4/CatchAllEllipsisUsedInNonMain.ql  |  2 +-
 .../UseOfDynamicExceptionSpecification.ql     |  2 +-
 .../IncompatibleNoexceptSpecification.ql      |  2 +-
 ...tibleNoexceptSpecificationForOverriders.ql |  2 +-
 .../InconsistentNoexceptFalseSpecification.ql |  2 +-
 .../InconsistentNoexceptTrueSpecification.ql  |  2 +-
 ...curInHeaderFileNameOrInIncludeDirective.ql |  4 +-
 .../src/rules/A16-6-1/ErrorDirectiveUsed.ql   |  2 +-
 ...StringNumberConversionMissingErrorCheck.ql |  2 +-
 .../UseOfUnsafeCStringToNumberConversion.ql   |  2 +-
 .../A18-1-2/VectorboolSpecializationUsed.ql   |  2 +-
 .../src/rules/A18-1-3/AutoPtrTypeUsed.ql      |  2 +-
 ...AnElementOfAnArrayPassedToASmartPointer.ql |  2 +-
 ...rNewAndOperatorDeleteNotDefinedGlobally.ql |  2 +-
 ...orNewAndOperatorDeleteNotDefinedLocally.ql |  2 +-
 .../rules/A18-5-3/NewArrayDeleteMismatch.ql   |  2 +-
 .../rules/A18-5-3/NewDeleteArrayMismatch.ql   |  2 +-
 .../A18-5-8/UnnecessaryUseOfDynamicStorage.ql |  2 +-
 ...ThrowingNoThrowOperatorNewDeleteAutosar.ql |  2 +-
 .../ThrowingOperatorNewReturnsNullAutosar.ql  |  2 +-
 ...peratorNewThrowsInvalidExceptionAutosar.ql |  2 +-
 cpp/autosar/src/rules/A18-9-1/BindUsed.ql     |  2 +-
 .../ForwardingValuesToOtherFunctions.ql       |  2 +-
 .../rules/A18-9-3/MoveUsedOnConstObjects.ql   |  2 +-
 .../ArgumentToForwardSubsequentlyUsed.ql      |  2 +-
 .../rules/A2-13-1/EscapeSequenceOutsideISO.ql |  2 +-
 ...ngLiteralsAssignedToNonConstantPointers.ql |  2 +-
 ...mesUsedOutsideCharacterOrStringLiterals.ql |  2 +-
 .../A2-7-1/SingleLineCommentEndsWithSlash.ql  |  4 +-
 ...PtrNotUsedToRepresentExclusiveOwnership.ql |  2 +-
 .../rules/A21-8-1/SignedValPassedToChar.ql    |  2 +-
 ...ratorImplicitlyConvertedToConstIterator.ql |  2 +-
 .../A3-1-1/ViolationsOfOneDefinitionRule.ql   |  2 +-
 .../HeaderFileExpectedFileNameExtension.ql    |  2 +-
 .../src/rules/A3-1-3/FileNameExtensionCpp.ql  |  2 +-
 ...ExternalLinkageArrayWithoutExplicitSize.ql |  2 +-
 ...ateFunctionDefinedInsideClassDefinition.ql |  2 +-
 ...alAccessorAndMutatorFunctionsNotInlined.ql |  2 +-
 ...onContainLessThanTwoLevelsOfIndirection.ql |  2 +-
 .../src/rules/A5-1-2/ImplicitLambdaCapture.ql |  2 +-
 .../LambdaExpressionWithoutParameterList.ql   |  2 +-
 .../LambdaExpressionInLambdaExpression.ql     |  2 +-
 .../A5-1-9/IdenticalLambdaExpressions.ql      |  2 +-
 ...rVirtualFunctionWithNullPointerConstant.ql |  2 +-
 .../rules/A5-3-2/NullPointersDereferenced.ql  |  2 +-
 ...erToMemberAccessNonExistentClassMembers.ql |  2 +-
 .../UninitializedStaticPointerToMemberUse.ql  |  2 +-
 .../ExplicitConstructionOfUnnamedTemporary.ql |  2 +-
 .../UnusedLoopCounterForContainerIteration.ql |  2 +-
 .../src/rules/A6-6-1/GotoStatementUsed.ql     |  2 +-
 .../src/rules/A7-1-4/RegisterKeywordUsed.ql   |  2 +-
 .../ClassStructEnumDeclaredInDefinition.ql    |  2 +-
 ...merationsNotDeclaredAsScopedEnumClasses.ql |  2 +-
 ...NoneFirstOrAllEnumeratorsNotInitialized.ql |  2 +-
 .../src/rules/A7-2-5/IntegerUsedForEnum.ql    |  2 +-
 .../rules/A7-5-1/InvalidFunctionReturnType.ql |  2 +-
 .../MoveFromConsumeParametersRvalRef.ql       |  2 +-
 .../A8-4-6/ForwardForwardingReferences.ql     |  2 +-
 ...nfusingUseOfInitializerListConstructors.ql |  2 +-
 ...lassBothVirtualAndNonVirtualInHierarchy.ql |  2 +-
 ...unctionOverriddenByAPureVirtualFunction.ql |  2 +-
 ...peOfThisUsedFromConstructorOrDestructor.ql |  2 +-
 .../CopyAssignmentOperatorNotDeclared.ql      |  2 +-
 .../src/rules/M15-0-3/GotoToCatchBlock.ql     |  2 +-
 .../src/rules/M15-0-3/SwitchToCatchBlock.ql   |  2 +-
 .../M15-1-1/ExceptionThrownDuringThrow.ql     |  2 +-
 .../src/rules/M15-1-2/NullThrownExplicitly.ql |  2 +-
 .../rules/M15-1-3/EmptyThrowOutsideCatch.ql   |  2 +-
 .../M15-3-1/ExceptionRaisedDuringStartup.ql   |  2 +-
 .../ExceptionRaisedDuringTermination.ql       |  2 +-
 ...edValueReferencedInDestructorCatchBlock.ql |  2 +-
 .../CatchAllExplicitlyThrownExceptions.ql     |  2 +-
 .../src/rules/M15-3-7/CatchAllHandlerLast.ql  |  2 +-
 .../FunctionLikeMacroArgsContainHashToken.ql  |  2 +-
 ...essorOperatorInOneOfTheTwoStandardForms.ql |  2 +-
 .../SetjmpMacroAndTheLongjmpFunctionUsed.ql   |  2 +-
 ...itGetenvAndSystemFromLibraryCstdlibUsed.ql |  2 +-
 ...TimeHandlingFunctionsOfLibraryCtimeUsed.ql |  2 +-
 .../rules/M2-13-2/UseOfNonZeroOctalEscape.ql  |  2 +-
 .../rules/M2-13-2/UseOfNonZeroOctalLiteral.ql |  2 +-
 .../M3-1-2/FunctionsDeclaredAtBlockScope.ql   |  2 +-
 ...gStaticSpecifierOnFunctionRedeclaration.ql |  4 +-
 ...epresentationsOfFloatingPointValuesUsed.ql |  2 +-
 .../rules/M4-10-1/NullUsedAsIntegerValue.ql   |  2 +-
 .../LiteralZeroUsedAsNullPointerConstant.ql   |  2 +-
 ...erAndDerivedPointerAccessDifferentArray.ql |  2 +-
 .../PointerSubtractionOnDifferentArrays.ql    |  2 +-
 .../src/rules/M5-18-1/CommaOperatorUsed.ql    |  2 +-
 ...antUnsignedIntegerExpressionsWrapAround.ql |  2 +-
 ...torsMixedWithOtherOperatorsInExpression.ql |  4 +-
 ...atorAndOperatorAndTheOperatorOverloaded.ql |  2 +-
 ...ointerToAVirtualBaseClassCastToAPointer.ql |  2 +-
 ...ExpressionWhoseUnderlyingTypeIsUnsigned.ql |  2 +-
 .../rules/M5-3-3/UnaryOperatorOverloaded.ql   |  2 +-
 .../rules/M6-2-1/AssignmentInSubExpression.ql |  2 +-
 .../rules/M6-2-2/FloatsTestedForEquality.ql   |  2 +-
 .../src/rules/M6-3-1/LoopCompoundCondition.ql |  2 +-
 .../rules/M6-3-1/SwitchCompoundCondition.ql   |  2 +-
 .../src/rules/M6-4-1/IfCompoundCondition.ql   |  2 +-
 .../M6-4-3/SwitchDoesNotStartWithCase.ql      |  2 +-
 .../M6-4-3/SwitchStatementNotWellFormed.ql    |  2 +-
 .../src/rules/M6-4-4/NestedCaseInSwitch.ql    |  4 +-
 .../NonEmptySwitchClauseDoesNotTerminate.ql   |  2 +-
 .../rules/M6-4-7/BooleanInSwitchCondition.ql  |  2 +-
 .../rules/M6-5-2/NotEqualsInLoopCondition.ql  |  2 +-
 .../LoopCounterModifiedWithinCondition.ql     |  2 +-
 ...pControlVariableModifiedInLoopCondition.ql |  2 +-
 ...ControlVariableModifiedInLoopExpression.ql |  2 +-
 .../src/rules/M6-6-1/GotoBlockCondition.ql    |  2 +-
 .../M6-6-2/GotoStatementJumpCondition.ql      |  2 +-
 .../UsingDeclarationsUsedInHeaderFiles.ql     |  2 +-
 .../FunctionReturnAutomaticVarCondition.ql    |  2 +-
 .../M7-5-2/AssignmentOfEscapingAutoStorage.ql |  2 +-
 ...ionParametersUseTheSameDefaultArguments.ql |  2 +-
 ...nstMemberFunctionReturnsNonConstPointer.ql |  2 +-
 ...NotAllowAMutexToGoOutOfScopeWhileLocked.ql |  2 +-
 .../DoNotDestroyAMutexWhileItIsLocked.ql      |  2 +-
 ...LocksAreReleasedOnExceptionalConditions.ql |  2 +-
 ...reventBitFieldAccessFromMultipleThreads.ql |  2 +-
 .../DeadlockByLockingInPredefinedOrder.ql     |  2 +-
 ...pFunctionsThatCanSpuriouslyWakeUpInLoop.ql |  2 +-
 ...eserveSafetyWhenUsingConditionVariables.ql |  2 +-
 .../UsesValidContainerElementAccess.ql        |  2 +-
 ...GenericCppLibraryFunctionsDoNotOverflow.ql |  2 +-
 .../rules/CTR53-CPP/UseValidIteratorRanges.ql |  2 +-
 ...SubtractIteratorsForDifferentContainers.ql |  2 +-
 .../DoNotUseAnAdditiveOperatorOnAnIterator.ql |  2 +-
 ...sePointerArithmeticOnPolymorphicObjects.ql |  2 +-
 .../DoNotDefineACStyleVariadicFunction.ql     |  2 +-
 ...tructorInitializedObjectHidesIdentifier.ql |  2 +-
 .../DCL53-CPP/LocalFunctionDeclaration.ql     |  2 +-
 .../SingularOverloadOfMemoryFunction.ql       |  2 +-
 .../DCL56-CPP/CyclesDuringStaticObjectInit.ql |  2 +-
 ...eFromDestructorsOrDeallocationFunctions.ql |  2 +-
 .../ModificationOfTheStandardNamespaces.ql    |  2 +-
 .../DCL59-CPP/UnnamedNamespaceInHeaderFile.ql |  2 +-
 .../ExitHandlerThrowsExceptionCert.ql         |  2 +-
 .../ExplicitAbruptTerminationCert.ql          |  2 +-
 .../RethrowNestedWithoutCaptureCert.ql        |  2 +-
 .../rules/ERR51-CPP/HandleAllExceptions.ql    |  2 +-
 .../ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql      |  2 +-
 ...rencedInConstructorDestructorCatchBlock.ql |  2 +-
 .../ERR54-CPP/CatchBlockShadowingCert.ql      |  2 +-
 .../ERR56-CPP/GuaranteeExceptionSafety.ql     |  2 +-
 ...oNotLeakResourcesWhenHandlingExceptions.ql |  2 +-
 ...onObjectsMustBeNothrowCopyConstructible.ql |  2 +-
 .../CatchExceptionsByLvalueReference.ql       |  2 +-
 ...ectErrorsWhenConvertingAStringToANumber.ql |  2 +-
 ...nArrayThroughAPointerOfTheIncorrectType.ql |  2 +-
 .../EXP53-CPP/DoNotReadUninitializedMemory.ql |  2 +-
 .../ObjectAccessedAfterLifetimeCert.ql        |  2 +-
 .../ObjectAccessedBeforeLifetimeCert.ql       |  2 +-
 .../DeletingPointerToIncompleteClass.ql       |  2 +-
 .../PassNonTrivialObjectToVaStart.ql          |  2 +-
 .../PassPromotablePrimitiveTypeToVaStart.ql   |  2 +-
 .../EXP58-CPP/PassReferenceTypeToVaStart.ql   |  2 +-
 ...apingLambdaObjectWithCaptureByReference.ql |  2 +-
 ...rningLambdaObjectWithCaptureByReference.ql |  2 +-
 .../MemcmpUsedToAccessObjectRepresentation.ql |  2 +-
 .../MemcpyUsedToAccessObjectRepresentation.ql |  2 +-
 .../MemsetUsedToAccessObjectRepresentation.ql |  2 +-
 .../DoNotRelyOnTheValueOfAMovedFromObject.ql  |  2 +-
 .../InterleavedInputOutputWithoutPosition.ql  |  2 +-
 .../CloseFilesWhenTheyAreNoLongerNeeded.ql    |  2 +-
 cpp/cert/src/rules/MEM50-CPP/UseAfterFree.ql  |  2 +-
 ...DeallocateDynamicallyAllocatedResources.ql |  2 +-
 .../DetectAndHandleMemoryAllocationErrors.ql  |  2 +-
 ...gDestructorCallForManuallyManagedObject.ql |  2 +-
 .../PlacementNewInsufficientStorageCert.ql    |  2 +-
 .../PlacementNewNotProperlyAlignedCert.ql     |  2 +-
 .../OperatorDeleteMissingPartnerCert.ql       |  2 +-
 .../ThrowingNoThrowOperatorNewDeleteCert.ql   |  2 +-
 .../ThrowingOperatorNewReturnsNullCert.ql     |  2 +-
 ...ngOperatorNewThrowsInvalidExceptionCert.ql |  2 +-
 ...ngDefaultOperatorNewForOverAlignedTypes.ql |  2 +-
 ...UseRandForGeneratingPseudorandomNumbers.ql |  2 +-
 .../BadlySeededRandomNumberGenerator.ql       |  2 +-
 .../NonVoidFunctionDoesNotReturnCert.ql       |  2 +-
 .../FunctionNoReturnAttributeConditionCert.ql |  2 +-
 .../SignalHandlerMustBeAPlainOldFunction.ql   |  2 +-
 ...lFunctionsFromConstructorsOrDestructors.ql |  2 +-
 .../OOP51-CPP/DoNotSliceDerivedObjects.ql     |  2 +-
 ...ymorphicObjectWithoutAVirtualDestructor.ql |  2 +-
 .../UseCanonicalOrderForMemberInit.ql         |  2 +-
 .../GracefullyHandleSelfCopyAssignment.ql     |  2 +-
 ...sWithUninitializedStaticPointerToMember.ql |  2 +-
 ...ointerToMemberToAccessNonexistentMember.ql |  2 +-
 ...fPointerToMemberToAccessUndefinedMember.ql |  2 +-
 .../HonorNewReplacementHandlerRequirements.ql |  2 +-
 ...rminationReplacementHandlerRequirements.ql |  2 +-
 ...dedOperatorsToCStandardLibraryFunctions.ql |  2 +-
 ...yOperationsMustNotMutateTheSourceObject.ql |  2 +-
 .../BasicStringMayNotBeNullTerminatedCert.ql  |  2 +-
 ...tionMayNotNullTerminateCStyleStringCert.ql |  2 +-
 ...tAttemptToCreateAStringFromANullPointer.ql |  2 +-
 .../UseValidReferencesForElementsOfString.ql  |  2 +-
 .../RangeCheckStringElementAccess.ql          |  2 +-
 rule_packages/c/Alignment.json                |  3 +-
 rule_packages/c/Banned.json                   |  3 +-
 rule_packages/c/Concurrency8.json             | 12 ++--
 rule_packages/c/Concurrency9.json             | 12 ++--
 rule_packages/c/Contracts4.json               |  6 +-
 rule_packages/c/Declarations1.json            |  7 +--
 rule_packages/c/Declarations6.json            |  3 +-
 rule_packages/c/Declarations7.json            |  3 +-
 rule_packages/c/Declarations8.json            |  3 +-
 rule_packages/c/Expressions.json              |  3 +-
 rule_packages/c/Generics.json                 |  5 +-
 rule_packages/c/IO4.json                      |  6 +-
 rule_packages/c/Language4.json                | 21 ++-----
 rule_packages/c/Memory2.json                  |  3 +-
 rule_packages/c/Pointers1.json                |  3 +-
 rule_packages/c/Preprocessor1.json            |  3 +-
 rule_packages/c/Preprocessor2.json            |  6 +-
 rule_packages/c/SideEffects3.json             |  3 +-
 rule_packages/c/Syntax.json                   |  3 +-
 rule_packages/cpp/Allocations.json            | 18 +++---
 rule_packages/cpp/BannedAPIs.json             |  6 +-
 rule_packages/cpp/BannedFunctions.json        |  6 +-
 rule_packages/cpp/Exceptions1.json            |  6 +-
 rule_packages/cpp/Expressions.json            |  6 +-
 rule_packages/cpp/ImportMisra23.json          | 63 +++++++------------
 rule_packages/cpp/Inheritance.json            |  8 +--
 rule_packages/cpp/Lambdas.json                |  3 +-
 rule_packages/cpp/Literals.json               |  3 +-
 rule_packages/cpp/Loops.json                  |  8 +--
 rule_packages/cpp/Macros.json                 |  6 +-
 rule_packages/cpp/Pointers.json               |  6 +-
 rule_packages/cpp/Scope.json                  |  6 +-
 rule_packages/cpp/Toolchain.json              | 18 ++----
 438 files changed, 524 insertions(+), 587 deletions(-)

diff --git a/c/cert/src/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.ql b/c/cert/src/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.ql
index 890f0a48e..65526ff73 100644
--- a/c/cert/src/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.ql
+++ b/c/cert/src/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/ARR36-C/DoNotRelatePointersThatDoNotReferToTheSameArray.ql b/c/cert/src/rules/ARR36-C/DoNotRelatePointersThatDoNotReferToTheSameArray.ql
index 274f381f3..5167dbcdb 100644
--- a/c/cert/src/rules/ARR36-C/DoNotRelatePointersThatDoNotReferToTheSameArray.ql
+++ b/c/cert/src/rules/ARR36-C/DoNotRelatePointersThatDoNotReferToTheSameArray.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p8
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql b/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql
index 908e1aa85..14f987dd7 100644
--- a/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql
+++ b/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON31-C/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql b/c/cert/src/rules/CON31-C/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
index 5d5af628a..5700fb19f 100644
--- a/c/cert/src/rules/CON31-C/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
+++ b/c/cert/src/rules/CON31-C/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON31-C/DoNotDestroyAMutexWhileItIsLocked.ql b/c/cert/src/rules/CON31-C/DoNotDestroyAMutexWhileItIsLocked.ql
index c70fe0329..244854b44 100644
--- a/c/cert/src/rules/CON31-C/DoNotDestroyAMutexWhileItIsLocked.ql
+++ b/c/cert/src/rules/CON31-C/DoNotDestroyAMutexWhileItIsLocked.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON32-C/PreventDataRacesWithMultipleThreads.ql b/c/cert/src/rules/CON32-C/PreventDataRacesWithMultipleThreads.ql
index 09bd234f6..94ff98f0d 100644
--- a/c/cert/src/rules/CON32-C/PreventDataRacesWithMultipleThreads.ql
+++ b/c/cert/src/rules/CON32-C/PreventDataRacesWithMultipleThreads.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p8
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON33-C/RaceConditionsWhenUsingLibraryFunctions.ql b/c/cert/src/rules/CON33-C/RaceConditionsWhenUsingLibraryFunctions.ql
index b58579d52..58762b7af 100644
--- a/c/cert/src/rules/CON33-C/RaceConditionsWhenUsingLibraryFunctions.ql
+++ b/c/cert/src/rules/CON33-C/RaceConditionsWhenUsingLibraryFunctions.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON36-C/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql b/c/cert/src/rules/CON36-C/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
index 86b7e373c..e13aed788 100644
--- a/c/cert/src/rules/CON36-C/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
+++ b/c/cert/src/rules/CON36-C/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON38-C/PreserveSafetyWhenUsingConditionVariables.ql b/c/cert/src/rules/CON38-C/PreserveSafetyWhenUsingConditionVariables.ql
index 736416f11..259a8fbec 100644
--- a/c/cert/src/rules/CON38-C/PreserveSafetyWhenUsingConditionVariables.ql
+++ b/c/cert/src/rules/CON38-C/PreserveSafetyWhenUsingConditionVariables.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON39-C/ThreadWasPreviouslyJoinedOrDetached.ql b/c/cert/src/rules/CON39-C/ThreadWasPreviouslyJoinedOrDetached.ql
index 30b56ad25..fa99b0308 100644
--- a/c/cert/src/rules/CON39-C/ThreadWasPreviouslyJoinedOrDetached.ql
+++ b/c/cert/src/rules/CON39-C/ThreadWasPreviouslyJoinedOrDetached.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON40-C/AtomicVariableTwiceInExpression.ql b/c/cert/src/rules/CON40-C/AtomicVariableTwiceInExpression.ql
index aad09e207..dbdb606f2 100644
--- a/c/cert/src/rules/CON40-C/AtomicVariableTwiceInExpression.ql
+++ b/c/cert/src/rules/CON40-C/AtomicVariableTwiceInExpression.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p8
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/CON41-C/WrapFunctionsThatCanFailSpuriouslyInLoop.ql b/c/cert/src/rules/CON41-C/WrapFunctionsThatCanFailSpuriouslyInLoop.ql
index 47e5bb20f..66c536167 100644
--- a/c/cert/src/rules/CON41-C/WrapFunctionsThatCanFailSpuriouslyInLoop.ql
+++ b/c/cert/src/rules/CON41-C/WrapFunctionsThatCanFailSpuriouslyInLoop.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql b/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql
index c890aacf5..cb59e2cef 100644
--- a/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql
+++ b/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/DCL38-C/DeclaringAFlexibleArrayMember.ql b/c/cert/src/rules/DCL38-C/DeclaringAFlexibleArrayMember.ql
index e3cb2d1f2..8e0ab1fd5 100644
--- a/c/cert/src/rules/DCL38-C/DeclaringAFlexibleArrayMember.ql
+++ b/c/cert/src/rules/DCL38-C/DeclaringAFlexibleArrayMember.ql
@@ -15,8 +15,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p3
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/DCL41-C/VariablesInsideSwitchStatement.ql b/c/cert/src/rules/DCL41-C/VariablesInsideSwitchStatement.ql
index 3fd118f12..e00c5ad91 100644
--- a/c/cert/src/rules/DCL41-C/VariablesInsideSwitchStatement.ql
+++ b/c/cert/src/rules/DCL41-C/VariablesInsideSwitchStatement.ql
@@ -15,8 +15,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/ENV30-C/DoNotModifyTheReturnValueOfCertainFunctions.ql b/c/cert/src/rules/ENV30-C/DoNotModifyTheReturnValueOfCertainFunctions.ql
index c56bb6f90..35f143962 100644
--- a/c/cert/src/rules/ENV30-C/DoNotModifyTheReturnValueOfCertainFunctions.ql
+++ b/c/cert/src/rules/ENV30-C/DoNotModifyTheReturnValueOfCertainFunctions.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/ENV31-C/EnvPointerIsInvalidAfterCertainOperations.ql b/c/cert/src/rules/ENV31-C/EnvPointerIsInvalidAfterCertainOperations.ql
index 072ee2766..b3d757ade 100644
--- a/c/cert/src/rules/ENV31-C/EnvPointerIsInvalidAfterCertainOperations.ql
+++ b/c/cert/src/rules/ENV31-C/EnvPointerIsInvalidAfterCertainOperations.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/ENV32-C/ExitHandlersMustReturnNormally.ql b/c/cert/src/rules/ENV32-C/ExitHandlersMustReturnNormally.ql
index 40d3b15b9..d8d30722f 100644
--- a/c/cert/src/rules/ENV32-C/ExitHandlersMustReturnNormally.ql
+++ b/c/cert/src/rules/ENV32-C/ExitHandlersMustReturnNormally.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p12
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvFunctions.ql b/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvFunctions.ql
index 2a9ee5d56..dce0e109b 100644
--- a/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvFunctions.ql
+++ b/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvFunctions.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvironmentFunWarn.ql b/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvironmentFunWarn.ql
index dd4c43104..1f3d754ad 100644
--- a/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvironmentFunWarn.ql
+++ b/c/cert/src/rules/ENV34-C/DoNotStorePointersReturnedByEnvironmentFunWarn.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/ERR30-C/ErrnoReadBeforeReturn.ql b/c/cert/src/rules/ERR30-C/ErrnoReadBeforeReturn.ql
index 401fb4ce8..e4eed883d 100644
--- a/c/cert/src/rules/ERR30-C/ErrnoReadBeforeReturn.ql
+++ b/c/cert/src/rules/ERR30-C/ErrnoReadBeforeReturn.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p8
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/ERR30-C/SetlocaleMightSetErrno.ql b/c/cert/src/rules/ERR30-C/SetlocaleMightSetErrno.ql
index 58468d1fe..bc9f50c0d 100644
--- a/c/cert/src/rules/ERR30-C/SetlocaleMightSetErrno.ql
+++ b/c/cert/src/rules/ERR30-C/SetlocaleMightSetErrno.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p8
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.ql b/c/cert/src/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.ql
index 3c0889892..ef5746e11 100644
--- a/c/cert/src/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.ql
+++ b/c/cert/src/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p3
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP32-C/DoNotAccessVolatileObjectWithNonVolatileReference.ql b/c/cert/src/rules/EXP32-C/DoNotAccessVolatileObjectWithNonVolatileReference.ql
index e97716a89..6bf0ffd4b 100644
--- a/c/cert/src/rules/EXP32-C/DoNotAccessVolatileObjectWithNonVolatileReference.ql
+++ b/c/cert/src/rules/EXP32-C/DoNotAccessVolatileObjectWithNonVolatileReference.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql b/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql
index 15594de9e..9d012ffec 100644
--- a/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql
+++ b/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql b/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql
index fbcfaa2aa..ec29b0a6c 100644
--- a/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql
+++ b/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP37-C/DoNotCallFunctionsWithIncompatibleArguments.ql b/c/cert/src/rules/EXP37-C/DoNotCallFunctionsWithIncompatibleArguments.ql
index 0b7dde938..e69ae9f03 100644
--- a/c/cert/src/rules/EXP37-C/DoNotCallFunctionsWithIncompatibleArguments.ql
+++ b/c/cert/src/rules/EXP37-C/DoNotCallFunctionsWithIncompatibleArguments.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql b/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql
index 9ffde045b..179bda372 100644
--- a/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql
+++ b/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
index 4879c4675..44490a3ff 100644
--- a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
+++ b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql b/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
index c0b7c8afc..856e4bbb3 100644
--- a/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
+++ b/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/EXP46-C/DoNotUseABitwiseOperatorWithABooleanLikeOperand.ql b/c/cert/src/rules/EXP46-C/DoNotUseABitwiseOperatorWithABooleanLikeOperand.ql
index 6a7e406e0..3ae86db89 100644
--- a/c/cert/src/rules/EXP46-C/DoNotUseABitwiseOperatorWithABooleanLikeOperand.ql
+++ b/c/cert/src/rules/EXP46-C/DoNotUseABitwiseOperatorWithABooleanLikeOperand.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p9
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO30-C/ExcludeUserInputFromFormatStrings.ql b/c/cert/src/rules/FIO30-C/ExcludeUserInputFromFormatStrings.ql
index b38a62c81..4ab43d227 100644
--- a/c/cert/src/rules/FIO30-C/ExcludeUserInputFromFormatStrings.ql
+++ b/c/cert/src/rules/FIO30-C/ExcludeUserInputFromFormatStrings.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql b/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql
index 111e17b13..f73e90688 100644
--- a/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql
+++ b/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p12
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO38-C/DoNotCopyAFileObject.ql b/c/cert/src/rules/FIO38-C/DoNotCopyAFileObject.ql
index ab66a396a..3fe7aa0a7 100644
--- a/c/cert/src/rules/FIO38-C/DoNotCopyAFileObject.ql
+++ b/c/cert/src/rules/FIO38-C/DoNotCopyAFileObject.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO39-C/DoNotAlternatelyIOFromAStreamWithoutPositioning.ql b/c/cert/src/rules/FIO39-C/DoNotAlternatelyIOFromAStreamWithoutPositioning.ql
index 1df6e26be..ae27bed41 100644
--- a/c/cert/src/rules/FIO39-C/DoNotAlternatelyIOFromAStreamWithoutPositioning.ql
+++ b/c/cert/src/rules/FIO39-C/DoNotAlternatelyIOFromAStreamWithoutPositioning.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.ql b/c/cert/src/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.ql
index 5fbe5695e..2afc6286e 100644
--- a/c/cert/src/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.ql
+++ b/c/cert/src/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO41-C/DoNotCallGetcAndPutcWithSideEffects.ql b/c/cert/src/rules/FIO41-C/DoNotCallGetcAndPutcWithSideEffects.ql
index 5986fb70e..e7be1c42b 100644
--- a/c/cert/src/rules/FIO41-C/DoNotCallGetcAndPutcWithSideEffects.ql
+++ b/c/cert/src/rules/FIO41-C/DoNotCallGetcAndPutcWithSideEffects.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql b/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql
index 5ce99960a..75c36179c 100644
--- a/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql
+++ b/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO46-C/UndefinedBehaviorAccessingAClosedFile.ql b/c/cert/src/rules/FIO46-C/UndefinedBehaviorAccessingAClosedFile.ql
index a0075a5ef..1373e265f 100644
--- a/c/cert/src/rules/FIO46-C/UndefinedBehaviorAccessingAClosedFile.ql
+++ b/c/cert/src/rules/FIO46-C/UndefinedBehaviorAccessingAClosedFile.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FIO47-C/UseValidSpecifiers.ql b/c/cert/src/rules/FIO47-C/UseValidSpecifiers.ql
index 4758431e4..ec64ea8f7 100644
--- a/c/cert/src/rules/FIO47-C/UseValidSpecifiers.ql
+++ b/c/cert/src/rules/FIO47-C/UseValidSpecifiers.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FLP30-C/FloatingPointLoopCounters.ql b/c/cert/src/rules/FLP30-C/FloatingPointLoopCounters.ql
index 24686fae5..f5fcf816d 100644
--- a/c/cert/src/rules/FLP30-C/FloatingPointLoopCounters.ql
+++ b/c/cert/src/rules/FLP30-C/FloatingPointLoopCounters.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/FLP37-C/MemcmpUsedToCompareFloats.ql b/c/cert/src/rules/FLP37-C/MemcmpUsedToCompareFloats.ql
index e23b66b26..b095f40af 100644
--- a/c/cert/src/rules/FLP37-C/MemcmpUsedToCompareFloats.ql
+++ b/c/cert/src/rules/FLP37-C/MemcmpUsedToCompareFloats.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/INT35-C/UseCorrectIntegerPrecisions.ql b/c/cert/src/rules/INT35-C/UseCorrectIntegerPrecisions.ql
index e8487eb2a..613117a1d 100644
--- a/c/cert/src/rules/INT35-C/UseCorrectIntegerPrecisions.ql
+++ b/c/cert/src/rules/INT35-C/UseCorrectIntegerPrecisions.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/MEM30-C/DoNotAccessFreedMemory.ql b/c/cert/src/rules/MEM30-C/DoNotAccessFreedMemory.ql
index 53283c041..2d4a0d55c 100644
--- a/c/cert/src/rules/MEM30-C/DoNotAccessFreedMemory.ql
+++ b/c/cert/src/rules/MEM30-C/DoNotAccessFreedMemory.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/MEM33-C/AllocStructsWithAFlexibleArrayMemberDynamically.ql b/c/cert/src/rules/MEM33-C/AllocStructsWithAFlexibleArrayMemberDynamically.ql
index 19f94ecc3..ee3162f89 100644
--- a/c/cert/src/rules/MEM33-C/AllocStructsWithAFlexibleArrayMemberDynamically.ql
+++ b/c/cert/src/rules/MEM33-C/AllocStructsWithAFlexibleArrayMemberDynamically.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p3
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/MEM33-C/CopyStructsWithAFlexibleArrayMemberDynamically.ql b/c/cert/src/rules/MEM33-C/CopyStructsWithAFlexibleArrayMemberDynamically.ql
index ab184f11e..d35ed46bd 100644
--- a/c/cert/src/rules/MEM33-C/CopyStructsWithAFlexibleArrayMemberDynamically.ql
+++ b/c/cert/src/rules/MEM33-C/CopyStructsWithAFlexibleArrayMemberDynamically.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p3
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql b/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql
index 92e95552a..730add5c4 100644
--- a/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql
+++ b/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.ql b/c/cert/src/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.ql
index b971a1797..13a5ced31 100644
--- a/c/cert/src/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.ql
+++ b/c/cert/src/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/MSC32-C/ProperlySeedPseudorandomNumberGenerators.ql b/c/cert/src/rules/MSC32-C/ProperlySeedPseudorandomNumberGenerators.ql
index ca20b4858..72cda3ac6 100644
--- a/c/cert/src/rules/MSC32-C/ProperlySeedPseudorandomNumberGenerators.ql
+++ b/c/cert/src/rules/MSC32-C/ProperlySeedPseudorandomNumberGenerators.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql b/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql
index 4fe66932f..074e03c62 100644
--- a/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql
+++ b/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p27
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql b/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
index 4d711d45f..b1df802ec 100644
--- a/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
+++ b/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p3
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/MSC40-C/DoNotViolateInLineLinkageConstraints.ql b/c/cert/src/rules/MSC40-C/DoNotViolateInLineLinkageConstraints.ql
index 30cc1f9f4..1d166f1f7 100644
--- a/c/cert/src/rules/MSC40-C/DoNotViolateInLineLinkageConstraints.ql
+++ b/c/cert/src/rules/MSC40-C/DoNotViolateInLineLinkageConstraints.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/PRE31-C/SideEffectsInArgumentsToUnsafeMacros.ql b/c/cert/src/rules/PRE31-C/SideEffectsInArgumentsToUnsafeMacros.ql
index 54775b0bf..e336e6305 100644
--- a/c/cert/src/rules/PRE31-C/SideEffectsInArgumentsToUnsafeMacros.ql
+++ b/c/cert/src/rules/PRE31-C/SideEffectsInArgumentsToUnsafeMacros.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p3
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql b/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql
index ba5c05c64..6b3af2544 100644
--- a/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql
+++ b/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql
@@ -15,8 +15,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql b/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql
index 2e1e5c922..7985155bc 100644
--- a/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql
+++ b/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/SIG34-C/DoNotCallSignalFromInterruptibleSignalHandlers.ql b/c/cert/src/rules/SIG34-C/DoNotCallSignalFromInterruptibleSignalHandlers.ql
index 76f4f0c1b..4fd4fd7b4 100644
--- a/c/cert/src/rules/SIG34-C/DoNotCallSignalFromInterruptibleSignalHandlers.ql
+++ b/c/cert/src/rules/SIG34-C/DoNotCallSignalFromInterruptibleSignalHandlers.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p3
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql b/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql
index 8d67cf267..d2d91ef29 100644
--- a/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql
+++ b/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p1
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql b/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql
index f77f54948..1b61cb349 100644
--- a/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql
+++ b/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p9
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql b/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
index 55efeb071..d92611a29 100644
--- a/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
+++ b/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
@@ -15,8 +15,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/STR37-C/ToCharacterHandlingFunctionsRepresentableAsUChar.ql b/c/cert/src/rules/STR37-C/ToCharacterHandlingFunctionsRepresentableAsUChar.ql
index 8bbe46682..397d56af4 100644
--- a/c/cert/src/rules/STR37-C/ToCharacterHandlingFunctionsRepresentableAsUChar.ql
+++ b/c/cert/src/rules/STR37-C/ToCharacterHandlingFunctionsRepresentableAsUChar.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p3
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/cert/src/rules/STR38-C/DoNotConfuseNarrowAndWideFunctions.ql b/c/cert/src/rules/STR38-C/DoNotConfuseNarrowAndWideFunctions.ql
index c0b9d2dfc..bf5616c31 100644
--- a/c/cert/src/rules/STR38-C/DoNotConfuseNarrowAndWideFunctions.ql
+++ b/c/cert/src/rules/STR38-C/DoNotConfuseNarrowAndWideFunctions.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p27
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql b/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql
index 6ba7ec185..7bd106ad8 100644
--- a/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql
+++ b/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql
@@ -11,8 +11,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql b/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql
index fc3415dc4..2db0c709f 100644
--- a/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql
+++ b/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql
@@ -10,8 +10,8 @@
  *       readability
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql b/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql
index 861c1a0ba..5410ab035 100644
--- a/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql
+++ b/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql
@@ -9,8 +9,8 @@
  *       readability
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql b/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
index 20bb65df2..058bf2ae3 100644
--- a/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
+++ b/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
@@ -11,8 +11,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql b/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql
index a444d81e1..0668eca69 100644
--- a/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql
+++ b/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql
@@ -10,8 +10,8 @@
  *       external/misra/c/2012/amendment4
  *       correctness
  *       concurrency
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql b/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql
index 80b9476ec..eb1840eaa 100644
--- a/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql
+++ b/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql
@@ -9,8 +9,8 @@
  *       external/misra/c/2012/amendment3
  *       security
  *       maintainability
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql b/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
index d7a16f782..afe903607 100644
--- a/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
+++ b/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-1-5
  *       correctness
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql b/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
index 541ec4c0b..df849cacb 100644
--- a/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
+++ b/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
@@ -10,8 +10,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
index 8fab94050..a0ae83b3d 100644
--- a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
+++ b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-1-5
  *       readability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
index 8cc95a79a..b5f77a5dc 100644
--- a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
+++ b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-1-5
  *       readability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql b/c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql
index c722c9ca5..e3a23eb25 100644
--- a/c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql
+++ b/c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-1-5
  *       correctness
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
index 4896ca306..f23a2c8c6 100644
--- a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
+++ b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
@@ -10,8 +10,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-11-10/AtomicQualifierAppliedToVoid.ql b/c/misra/src/rules/RULE-11-10/AtomicQualifierAppliedToVoid.ql
index a9955db89..009026f82 100644
--- a/c/misra/src/rules/RULE-11-10/AtomicQualifierAppliedToVoid.ql
+++ b/c/misra/src/rules/RULE-11-10/AtomicQualifierAppliedToVoid.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/c/2012/amendment4
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql b/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
index 22e2a00c2..4864d46f2 100644
--- a/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
+++ b/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-11-2
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql b/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
index bd0ecba46..5d0bbd63d 100644
--- a/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
+++ b/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-11-7
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
index 63f8fe5e7..55665d539 100644
--- a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
+++ b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-11-9
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql b/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql
index 41da3185e..f375876cf 100644
--- a/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-12-3
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql b/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql
index 810227c8f..817924a03 100644
--- a/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql
+++ b/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql
@@ -15,8 +15,8 @@
  *       correctness
  *       security
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql b/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql
index 58c6f4072..88b9e285a 100644
--- a/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql
+++ b/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql
@@ -8,8 +8,8 @@
  * @problem.severity error
  * @tags external/misra/id/rule-12-5
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-12-6/AtomicAggregateObjectDirectlyAccessed.ql b/c/misra/src/rules/RULE-12-6/AtomicAggregateObjectDirectlyAccessed.ql
index b47b8f8de..11b54d8de 100644
--- a/c/misra/src/rules/RULE-12-6/AtomicAggregateObjectDirectlyAccessed.ql
+++ b/c/misra/src/rules/RULE-12-6/AtomicAggregateObjectDirectlyAccessed.ql
@@ -9,8 +9,8 @@
  *       external/misra/c/2012/amendment4
  *       correctness
  *       concurrency
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql b/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql
index dcf720e6d..8be532a3d 100644
--- a/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-13-1
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedAtomicReads.ql b/c/misra/src/rules/RULE-13-2/UnsequencedAtomicReads.ql
index 7e6a834b5..d19a38e0e 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedAtomicReads.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedAtomicReads.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-13-2
  *       correctness
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
index 2d288607e..4ed4893db 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-13-2
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
index fc4bb8f9a..c6d0e4ab8 100644
--- a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql b/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql
index f96982032..71595e147 100644
--- a/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql
+++ b/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-13-6
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql b/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql
index 59c1173e4..86dee239e 100644
--- a/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql
+++ b/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql
@@ -9,8 +9,8 @@
  *       maintainability
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql b/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql
index 5372cb9c3..42d0fac7f 100644
--- a/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql
+++ b/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql
@@ -11,8 +11,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
index 1d1353de6..00e4645ee 100644
--- a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
+++ b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
@@ -9,8 +9,8 @@
  *       correctness
  *       security
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql b/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql
index 9da281a0d..502fcfdd6 100644
--- a/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql
+++ b/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql
@@ -9,9 +9,9 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
- *       coding-standards/baseline/style
  *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
index d51e3493e..aeb04d5ed 100644
--- a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
+++ b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
@@ -10,8 +10,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
index db2313fb2..294649ab9 100644
--- a/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
@@ -10,8 +10,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
index 3c6a45bb5..f1b220371 100644
--- a/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
@@ -1,6 +1,6 @@
 /**
  * @id c/misra/selection-compound-condition
- * @name RULE-15-6: The statement forming the body of a selection statement shall be a compound statement
+ * @name RULE-15-6: The statement forming the body of a slection statement shall be a compound statement
  * @description if the body of a selection statement is not enclosed in braces, then this can lead
  *              to incorrect execution, and is hard for developers to maintain.
  * @kind problem
@@ -10,8 +10,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql
index 05780aa28..1b181b4b4 100644
--- a/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql
@@ -10,8 +10,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql b/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql
index fc16d511c..4cbd080bc 100644
--- a/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql
+++ b/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql
@@ -9,8 +9,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql b/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql
index 059a3f3a7..d0a25a649 100644
--- a/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql
+++ b/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql
@@ -9,8 +9,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql b/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql
index 237e4d7c0..1e9b1c731 100644
--- a/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql
+++ b/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql
@@ -9,8 +9,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql b/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql
index f69a0a740..06f66d91e 100644
--- a/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql
+++ b/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql
@@ -7,8 +7,8 @@
  * @problem.severity recommendation
  * @tags external/misra/id/rule-16-5
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql b/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql
index bd59c8344..e8e06e367 100644
--- a/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql
+++ b/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql
@@ -9,8 +9,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
index a26699f06..b3d420c2a 100644
--- a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
+++ b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-17-11
  *       correctness
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql b/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql
index f956fcec6..059dc5b60 100644
--- a/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql
+++ b/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql b/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql
index df21468e0..626e7014c 100644
--- a/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql
+++ b/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql
@@ -11,9 +11,9 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
- *       coding-standards/baseline/style
  *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql b/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
index 194b89fce..65f31d12d 100644
--- a/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
+++ b/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
@@ -1,6 +1,6 @@
 /**
  * @id c/misra/array-function-argument-number-of-elements
- * @name RULE-17-5: An array function argument shall have an appropriate number of elements
+ * @name RULE-17-5: An array founction argument shall have an appropriate number of elements
  * @description The function argument corresponding to an array parameter shall have an appropriate
  *              number of elements.
  * @kind problem
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-17-5
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql b/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql
index fce081cba..12c497906 100644
--- a/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql
+++ b/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-17-6
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
index 10989476f..ca3eef930 100644
--- a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
+++ b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-17-9
  *       correctness
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
index 81a0996fb..1d301730f 100644
--- a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
@@ -11,8 +11,8 @@
  *       external/misra/c/2012/amendment4
  *       correctness
  *       security
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql b/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql
index 419199502..d36c4acf3 100644
--- a/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql
+++ b/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-18-5
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql b/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql
index a89d12152..d743032b2 100644
--- a/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql
+++ b/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql
@@ -10,8 +10,8 @@
  * @tags external/misra/id/rule-18-6
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-6/ThreadLocalObjectAddressCopiedToGlobalObject.ql b/c/misra/src/rules/RULE-18-6/ThreadLocalObjectAddressCopiedToGlobalObject.ql
index d29bfde9f..adfb4ab37 100644
--- a/c/misra/src/rules/RULE-18-6/ThreadLocalObjectAddressCopiedToGlobalObject.ql
+++ b/c/misra/src/rules/RULE-18-6/ThreadLocalObjectAddressCopiedToGlobalObject.ql
@@ -10,8 +10,8 @@
  * @tags external/misra/id/rule-18-6
  *       correctness
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql b/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql
index f840e5ec5..cdfeba539 100644
--- a/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql
+++ b/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql
@@ -8,9 +8,9 @@
  * @tags external/misra/id/rule-18-7
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
- *       coding-standards/baseline/style
  *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
index d6e868364..b8bda6d0d 100644
--- a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
@@ -9,9 +9,9 @@
  *       correctness
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
- *       coding-standards/baseline/style
  *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql b/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
index 9593ec19b..4cb3ff7ca 100644
--- a/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
+++ b/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
@@ -10,8 +10,8 @@
  *       external/misra/c/2012/amendment3
  *       correctness
  *       security
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql b/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
index ad9856a42..5fbc41f56 100644
--- a/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
+++ b/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
@@ -10,8 +10,8 @@
  *       external/misra/c/2012/amendment3
  *       correctness
  *       security
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql b/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql
index 5460824b8..02fc0f9cc 100644
--- a/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql
+++ b/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-19-1
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql b/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
index 76b4e44e5..2dc4db57f 100644
--- a/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
+++ b/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-19-1
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-1/UnreachableCode.ql b/c/misra/src/rules/RULE-2-1/UnreachableCode.ql
index f8c5c90c6..0b972331a 100644
--- a/c/misra/src/rules/RULE-2-1/UnreachableCode.ql
+++ b/c/misra/src/rules/RULE-2-1/UnreachableCode.ql
@@ -10,8 +10,8 @@
  *       readability
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-2/DeadCode.ql b/c/misra/src/rules/RULE-2-2/DeadCode.ql
index 05f6fc17a..ee19d2bf1 100644
--- a/c/misra/src/rules/RULE-2-2/DeadCode.ql
+++ b/c/misra/src/rules/RULE-2-2/DeadCode.ql
@@ -10,8 +10,8 @@
  *       readability
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql b/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql
index 03a3284ee..4c497f3ae 100644
--- a/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql
+++ b/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql
@@ -10,8 +10,8 @@
  *       readability
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql b/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
index 2943bcd00..3481eb3bc 100644
--- a/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
+++ b/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
@@ -10,8 +10,8 @@
  *       readability
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql b/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql
index 76e5d0731..59dc43f29 100644
--- a/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql
+++ b/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql
@@ -10,8 +10,8 @@
  *       readability
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-2-8/UnusedObjectDefinition.ql b/c/misra/src/rules/RULE-2-8/UnusedObjectDefinition.ql
index 66d155800..1acaa1d9a 100644
--- a/c/misra/src/rules/RULE-2-8/UnusedObjectDefinition.ql
+++ b/c/misra/src/rules/RULE-2-8/UnusedObjectDefinition.ql
@@ -9,8 +9,8 @@
  *       maintainability
  *       performance
  *       external/misra/c/2012/amendment4
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql b/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql
index a4e0c1726..63d496461 100644
--- a/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql
+++ b/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-20-1
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
index e1299f1a8..4afe74948 100644
--- a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
+++ b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-20-11
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql b/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql
index 0e2e6525b..5dac87c9c 100644
--- a/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql
+++ b/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-20-2
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql b/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql
index e1dbfad2d..5af7dcd1c 100644
--- a/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql
+++ b/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql
@@ -12,8 +12,8 @@
  *       readability
  *       maintainability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql b/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql
index a224ce0ea..f1acc552e 100644
--- a/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql
@@ -9,8 +9,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql b/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql
index 017cc85d6..b312111ce 100644
--- a/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql
+++ b/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql
@@ -10,8 +10,8 @@
  *       readability
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql b/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql
index d4852715c..d1ffeb439 100644
--- a/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql
+++ b/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql
@@ -11,8 +11,8 @@
  *       correctness
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql b/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql
index 9ec9197c7..312cfc2d0 100644
--- a/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql
+++ b/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql
@@ -8,8 +8,8 @@
  * @problem.severity error
  * @tags external/misra/id/rule-21-13
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql b/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
index c9d68e459..167d0148e 100644
--- a/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
+++ b/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
@@ -10,8 +10,8 @@
  *       maintainability
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql b/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
index ed1619b03..52d60779f 100644
--- a/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
+++ b/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
@@ -8,8 +8,8 @@
  * @problem.severity error
  * @tags external/misra/id/rule-21-15
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql b/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql
index fa2a37d83..1cbec6d86 100644
--- a/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql
+++ b/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       security
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql b/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql
index f12ca680d..3457e8ece 100644
--- a/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql
+++ b/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql
@@ -11,8 +11,8 @@
  *       correctness
  *       security
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql b/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql
index 2d342d789..cfe5cccce 100644
--- a/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql
+++ b/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql
@@ -10,8 +10,8 @@
  * @tags external/misra/id/rule-21-19
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql
index 5adb6adcd..869ec302e 100644
--- a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql
+++ b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql
@@ -10,8 +10,8 @@
  * @tags external/misra/id/rule-21-20
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql
index 194ecf15b..1865f2195 100644
--- a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql
+++ b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql
@@ -10,8 +10,8 @@
  * @tags external/misra/id/rule-21-20
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-23/TgMathArgumentsWithDifferingStandardType.ql b/c/misra/src/rules/RULE-21-23/TgMathArgumentsWithDifferingStandardType.ql
index 6f844caab..c802cbcf8 100644
--- a/c/misra/src/rules/RULE-21-23/TgMathArgumentsWithDifferingStandardType.ql
+++ b/c/misra/src/rules/RULE-21-23/TgMathArgumentsWithDifferingStandardType.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-21-23
  *       correctness
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql b/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
index 189bf5746..a17e09b15 100644
--- a/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
+++ b/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-21-24
  *       security
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-26/TimedlockOnInappropriateMutexType.ql b/c/misra/src/rules/RULE-21-26/TimedlockOnInappropriateMutexType.ql
index e666077cc..6105c8488 100644
--- a/c/misra/src/rules/RULE-21-26/TimedlockOnInappropriateMutexType.ql
+++ b/c/misra/src/rules/RULE-21-26/TimedlockOnInappropriateMutexType.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       concurrency
  *       external/misra/c/2012/amendment4
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql b/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql
index 924788fa6..61345682b 100644
--- a/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql
+++ b/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-21-4
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql b/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
index 7f67be808..4b24a5714 100644
--- a/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
+++ b/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-21-7
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql b/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql
index 022b83f45..295fde1b8 100644
--- a/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql
+++ b/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       security
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql b/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql
index b9d590097..3c36bf615 100644
--- a/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql
+++ b/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       security
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql b/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql
index 432cd3229..f561bda96 100644
--- a/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql
+++ b/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql
@@ -10,8 +10,8 @@
  * @tags external/misra/id/rule-22-10
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-11/ThreadPreviouslyJoinedOrDetached.ql b/c/misra/src/rules/RULE-22-11/ThreadPreviouslyJoinedOrDetached.ql
index ab6059c43..8c970007b 100644
--- a/c/misra/src/rules/RULE-22-11/ThreadPreviouslyJoinedOrDetached.ql
+++ b/c/misra/src/rules/RULE-22-11/ThreadPreviouslyJoinedOrDetached.ql
@@ -10,8 +10,8 @@
  *       external/misra/c/2012/amendment4
  *       correctness
  *       concurrency
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-14/MutexInitWithInvalidMutexType.ql b/c/misra/src/rules/RULE-22-14/MutexInitWithInvalidMutexType.ql
index 383f3c49b..fcd583f7c 100644
--- a/c/misra/src/rules/RULE-22-14/MutexInitWithInvalidMutexType.ql
+++ b/c/misra/src/rules/RULE-22-14/MutexInitWithInvalidMutexType.ql
@@ -9,8 +9,8 @@
  *       correctness
  *       concurrency
  *       external/misra/c/2012/amendment4
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.ql b/c/misra/src/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.ql
index 87e389b17..d0df44bef 100644
--- a/c/misra/src/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.ql
+++ b/c/misra/src/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       concurrency
  *       external/misra/c/2012/amendment4
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-17/InvalidOperationOnUnlockedMutex.ql b/c/misra/src/rules/RULE-22-17/InvalidOperationOnUnlockedMutex.ql
index 2d1b850e5..230f366cb 100644
--- a/c/misra/src/rules/RULE-22-17/InvalidOperationOnUnlockedMutex.ql
+++ b/c/misra/src/rules/RULE-22-17/InvalidOperationOnUnlockedMutex.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       concurrency
  *       external/misra/c/2012/amendment4
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-19/ConditionVariableUsedWithMultipleMutexes.ql b/c/misra/src/rules/RULE-22-19/ConditionVariableUsedWithMultipleMutexes.ql
index e19d4cb02..196f4bce2 100644
--- a/c/misra/src/rules/RULE-22-19/ConditionVariableUsedWithMultipleMutexes.ql
+++ b/c/misra/src/rules/RULE-22-19/ConditionVariableUsedWithMultipleMutexes.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       concurrency
  *       external/misra/c/2012/amendment4
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql b/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql
index aa1977e31..b99b991e3 100644
--- a/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql
+++ b/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       security
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-20/ThreadStorageNotInitializedBeforeUse.ql b/c/misra/src/rules/RULE-22-20/ThreadStorageNotInitializedBeforeUse.ql
index 793779284..b0c80b537 100644
--- a/c/misra/src/rules/RULE-22-20/ThreadStorageNotInitializedBeforeUse.ql
+++ b/c/misra/src/rules/RULE-22-20/ThreadStorageNotInitializedBeforeUse.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       concurrency
  *       external/misra/c/2012/amendment4
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql b/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
index 0b7810702..a4f704dcb 100644
--- a/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
+++ b/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-22-3
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql b/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
index 28b751b79..0dab5dff8 100644
--- a/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
+++ b/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-22-4
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql b/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql
index db6c6c64b..2456824be 100644
--- a/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql
+++ b/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-22-5
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql b/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql
index 834d43475..8ebacf486 100644
--- a/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql
+++ b/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-22-6
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql b/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql
index 90a0d3923..78740e6c3 100644
--- a/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql
+++ b/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-22-7
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql b/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql
index efaa64725..509d53988 100644
--- a/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql
+++ b/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql
@@ -10,8 +10,8 @@
  * @tags external/misra/id/rule-22-8
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql b/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql
index e06f57127..53aaf9db6 100644
--- a/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql
+++ b/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-22-9
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-1/GenericSelectionDoesntDependOnMacroArgument.ql b/c/misra/src/rules/RULE-23-1/GenericSelectionDoesntDependOnMacroArgument.ql
index 9754a1bef..8c4003dca 100644
--- a/c/misra/src/rules/RULE-23-1/GenericSelectionDoesntDependOnMacroArgument.ql
+++ b/c/misra/src/rules/RULE-23-1/GenericSelectionDoesntDependOnMacroArgument.ql
@@ -9,8 +9,8 @@
  *       correctness
  *       maintainability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-1/GenericSelectionNotExpandedFromAMacro.ql b/c/misra/src/rules/RULE-23-1/GenericSelectionNotExpandedFromAMacro.ql
index 3134960d8..0b57c4834 100644
--- a/c/misra/src/rules/RULE-23-1/GenericSelectionNotExpandedFromAMacro.ql
+++ b/c/misra/src/rules/RULE-23-1/GenericSelectionNotExpandedFromAMacro.ql
@@ -8,8 +8,8 @@
  * @tags external/misra/id/rule-23-1
  *       maintainability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-2/GenericSelectionNotFromMacroWithSideEffects.ql b/c/misra/src/rules/RULE-23-2/GenericSelectionNotFromMacroWithSideEffects.ql
index 08c438e7e..c91b43bfe 100644
--- a/c/misra/src/rules/RULE-23-2/GenericSelectionNotFromMacroWithSideEffects.ql
+++ b/c/misra/src/rules/RULE-23-2/GenericSelectionNotFromMacroWithSideEffects.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-23-2
  *       maintainability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-3/GenericWithoutNonDefaultAssociation.ql b/c/misra/src/rules/RULE-23-3/GenericWithoutNonDefaultAssociation.ql
index 7240d0a7a..216822f95 100644
--- a/c/misra/src/rules/RULE-23-3/GenericWithoutNonDefaultAssociation.ql
+++ b/c/misra/src/rules/RULE-23-3/GenericWithoutNonDefaultAssociation.ql
@@ -9,8 +9,8 @@
  *       correctness
  *       maintainability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-4/GenericAssociationWithUnselectableType.ql b/c/misra/src/rules/RULE-23-4/GenericAssociationWithUnselectableType.ql
index f29f68868..96d0554e9 100644
--- a/c/misra/src/rules/RULE-23-4/GenericAssociationWithUnselectableType.ql
+++ b/c/misra/src/rules/RULE-23-4/GenericAssociationWithUnselectableType.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-23-4
  *       correctness
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-5/DangerousDefaultSelectionForPointerInGeneric.ql b/c/misra/src/rules/RULE-23-5/DangerousDefaultSelectionForPointerInGeneric.ql
index 7369e9520..1431808ec 100644
--- a/c/misra/src/rules/RULE-23-5/DangerousDefaultSelectionForPointerInGeneric.ql
+++ b/c/misra/src/rules/RULE-23-5/DangerousDefaultSelectionForPointerInGeneric.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-23-5
  *       correctness
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-7/InvalidGenericMacroArgumentEvaluation.ql b/c/misra/src/rules/RULE-23-7/InvalidGenericMacroArgumentEvaluation.ql
index f5026aa99..22a2def69 100644
--- a/c/misra/src/rules/RULE-23-7/InvalidGenericMacroArgumentEvaluation.ql
+++ b/c/misra/src/rules/RULE-23-7/InvalidGenericMacroArgumentEvaluation.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       maintainability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-23-8/DefaultGenericSelectionNotFirstOrLast.ql b/c/misra/src/rules/RULE-23-8/DefaultGenericSelectionNotFirstOrLast.ql
index 85b00d647..44349fc14 100644
--- a/c/misra/src/rules/RULE-23-8/DefaultGenericSelectionNotFirstOrLast.ql
+++ b/c/misra/src/rules/RULE-23-8/DefaultGenericSelectionNotFirstOrLast.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-23-8
  *       maintainability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql b/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql
index e51b6e728..d3999631c 100644
--- a/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql
+++ b/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql
@@ -11,9 +11,9 @@
  *       readability
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
- *       coding-standards/baseline/style
  *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
index 6193daead..8ef3753c8 100644
--- a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
+++ b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
@@ -11,8 +11,8 @@
  *       readability
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql b/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql
index 0b1d6be56..6e5a75253 100644
--- a/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql
+++ b/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql
@@ -10,8 +10,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql b/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql
index 65329cc89..3599259f2 100644
--- a/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql
+++ b/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql
@@ -10,8 +10,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql b/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql
index 734cbe2e0..2b54247cd 100644
--- a/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql
+++ b/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql
@@ -9,8 +9,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
index b941391c7..ce449bf57 100644
--- a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
+++ b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
@@ -8,8 +8,8 @@
  * @problem.severity error
  * @tags external/misra/id/rule-6-2
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql b/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
index 1dbca0094..f2d5bff72 100644
--- a/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
+++ b/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-6-3
  *       correctness
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql b/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
index 0ff64db47..993e18e4c 100644
--- a/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
+++ b/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-7-6
  *       readability
  *       external/misra/c/2012/amendment3
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql b/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql
index 88dbb3cd7..e3e8546a2 100644
--- a/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql
+++ b/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql
@@ -9,8 +9,8 @@
  *       correctness
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql b/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql
index 3dd7c4180..e56f5a6c6 100644
--- a/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql
+++ b/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql
@@ -9,9 +9,9 @@
  * @tags external/misra/id/rule-8-10
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
index c3488e1e6..f131f4722 100644
--- a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
+++ b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
@@ -10,8 +10,8 @@
  *       correctness
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql b/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql
index fb5ccaea5..adeefdeff 100644
--- a/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql
+++ b/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql
@@ -9,8 +9,8 @@
  *       correctness
  *       security
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
index 7260dd042..463bc7b46 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
@@ -10,8 +10,8 @@
  *       external/misra/c/2012/amendment3
  *       readability
  *       maintainability
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
index fbb81d046..51bf6a27c 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
@@ -10,9 +10,9 @@
  *       external/misra/c/2012/amendment3
  *       readability
  *       maintainability
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql b/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
index fb0e39aad..69b23d9bd 100644
--- a/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
+++ b/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
@@ -9,8 +9,8 @@
  *       external/misra/c/2012/amendment3
  *       readability
  *       maintainability
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql b/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
index 4f70f08a4..712301908 100644
--- a/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
+++ b/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-8-17
  *       external/misra/c/2012/amendment3
  *       readability
- *       external/misra/obligation/advisory
  *       coding-standards/baseline/style
+ *       external/misra/obligation/advisory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql b/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
index 37f5888a7..4ed1255ad 100644
--- a/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
+++ b/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-8-2
  *       correctness
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql
index 8fabae7f8..df7673f97 100644
--- a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql
+++ b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql
@@ -9,9 +9,9 @@
  * @tags external/misra/id/rule-8-8
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
index fc397d6d5..0490b22f3 100644
--- a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
+++ b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
@@ -9,9 +9,9 @@
  * @tags external/misra/id/rule-8-8
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql b/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql
index c78d56ab5..c48e02aba 100644
--- a/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql
+++ b/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql
@@ -9,8 +9,8 @@
  *       correctness
  *       security
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql b/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql
index 5a1d833ad..e2fc8a043 100644
--- a/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql
+++ b/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql
@@ -10,8 +10,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/style
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql b/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql
index 724d5d94c..d942df13a 100644
--- a/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql
+++ b/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql
@@ -10,8 +10,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql b/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
index 873b4d243..b0634986d 100644
--- a/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
+++ b/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
@@ -11,8 +11,8 @@
  *       maintainability
  *       readability
  *       external/misra/c/2012/third-edition-first-revision
- *       external/misra/obligation/required
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/required
  */
 
 import cpp
diff --git a/c/misra/src/rules/RULE-9-7/UninitializedAtomicObject.ql b/c/misra/src/rules/RULE-9-7/UninitializedAtomicObject.ql
index 9eb3d25e9..1f6a53eab 100644
--- a/c/misra/src/rules/RULE-9-7/UninitializedAtomicObject.ql
+++ b/c/misra/src/rules/RULE-9-7/UninitializedAtomicObject.ql
@@ -9,8 +9,8 @@
  * @tags external/misra/id/rule-9-7
  *       concurrency
  *       external/misra/c/2012/amendment4
- *       external/misra/obligation/mandatory
  *       coding-standards/baseline/safety
+ *       external/misra/obligation/mandatory
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A0-1-1/UselessAssignment.ql b/cpp/autosar/src/rules/A0-1-1/UselessAssignment.ql
index 16ab39817..0780610a3 100644
--- a/cpp/autosar/src/rules/A0-1-1/UselessAssignment.ql
+++ b/cpp/autosar/src/rules/A0-1-1/UselessAssignment.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/a0-1-1
  *       readability
  *       maintainability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A1-1-1/CStandardLibraryHeadersAreDeprecated.ql b/cpp/autosar/src/rules/A1-1-1/CStandardLibraryHeadersAreDeprecated.ql
index 047aba1bc..faca780ec 100644
--- a/cpp/autosar/src/rules/A1-1-1/CStandardLibraryHeadersAreDeprecated.ql
+++ b/cpp/autosar/src/rules/A1-1-1/CStandardLibraryHeadersAreDeprecated.ql
@@ -7,10 +7,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a1-1-1
  *       maintainability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A10-1-1/ClassDerivedFromMoreThanOneNonInterfaceBaseClass.ql b/cpp/autosar/src/rules/A10-1-1/ClassDerivedFromMoreThanOneNonInterfaceBaseClass.ql
index 749c3c520..d8bcaae31 100644
--- a/cpp/autosar/src/rules/A10-1-1/ClassDerivedFromMoreThanOneNonInterfaceBaseClass.ql
+++ b/cpp/autosar/src/rules/A10-1-1/ClassDerivedFromMoreThanOneNonInterfaceBaseClass.ql
@@ -7,10 +7,10 @@
  * @precision very-high
  * @problem.severity warning
  * @tags external/autosar/id/a10-1-1
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A10-3-5/UserDefinedAssignmentOperatorVirtual.ql b/cpp/autosar/src/rules/A10-3-5/UserDefinedAssignmentOperatorVirtual.ql
index 27321c1a2..998ad068d 100644
--- a/cpp/autosar/src/rules/A10-3-5/UserDefinedAssignmentOperatorVirtual.ql
+++ b/cpp/autosar/src/rules/A10-3-5/UserDefinedAssignmentOperatorVirtual.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a10-3-5
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A12-1-4/ConstructorWithFundamentalArgMissingExplicit.ql b/cpp/autosar/src/rules/A12-1-4/ConstructorWithFundamentalArgMissingExplicit.ql
index 8614341e5..8c66d531a 100644
--- a/cpp/autosar/src/rules/A12-1-4/ConstructorWithFundamentalArgMissingExplicit.ql
+++ b/cpp/autosar/src/rules/A12-1-4/ConstructorWithFundamentalArgMissingExplicit.ql
@@ -9,11 +9,11 @@
  * @tags external/autosar/id/a12-1-4
  *       readability
  *       maintainability
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A12-4-1/DestructorOfABaseClassNotPublicVirtual.ql b/cpp/autosar/src/rules/A12-4-1/DestructorOfABaseClassNotPublicVirtual.ql
index 1a2e89a64..239cc1ed5 100644
--- a/cpp/autosar/src/rules/A12-4-1/DestructorOfABaseClassNotPublicVirtual.ql
+++ b/cpp/autosar/src/rules/A12-4-1/DestructorOfABaseClassNotPublicVirtual.ql
@@ -11,10 +11,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a12-4-1
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A12-6-1/ClassDataMembersInitializationCondition.ql b/cpp/autosar/src/rules/A12-6-1/ClassDataMembersInitializationCondition.ql
index a04bb0a8c..35c3a9ae1 100644
--- a/cpp/autosar/src/rules/A12-6-1/ClassDataMembersInitializationCondition.ql
+++ b/cpp/autosar/src/rules/A12-6-1/ClassDataMembersInitializationCondition.ql
@@ -7,10 +7,10 @@
  * @precision very-high
  * @problem.severity recommendation
  * @tags external/autosar/id/a12-6-1
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A12-8-4/MoveConstructorUsesCopySemantics.ql b/cpp/autosar/src/rules/A12-8-4/MoveConstructorUsesCopySemantics.ql
index 6541f8bce..13fb3f12e 100644
--- a/cpp/autosar/src/rules/A12-8-4/MoveConstructorUsesCopySemantics.ql
+++ b/cpp/autosar/src/rules/A12-8-4/MoveConstructorUsesCopySemantics.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/a12-8-4
  *       maintainability
  *       performance
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql b/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql
index 1ffcfd8b7..d2fa57393 100644
--- a/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql
+++ b/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql
@@ -8,11 +8,11 @@
  * @problem.severity error
  * @tags external/autosar/id/a13-2-1
  *       correctness
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A13-5-2/UserDefinedConversionOperatorsNotDefinedExplicit.ql b/cpp/autosar/src/rules/A13-5-2/UserDefinedConversionOperatorsNotDefinedExplicit.ql
index b8441dfc0..226aaf19b 100644
--- a/cpp/autosar/src/rules/A13-5-2/UserDefinedConversionOperatorsNotDefinedExplicit.ql
+++ b/cpp/autosar/src/rules/A13-5-2/UserDefinedConversionOperatorsNotDefinedExplicit.ql
@@ -7,11 +7,11 @@
  * @problem.severity error
  * @tags external/autosar/id/a13-5-2
  *       correctness
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A13-5-4/OppositeOperatorsNotDefinedInTermsOfOther.ql b/cpp/autosar/src/rules/A13-5-4/OppositeOperatorsNotDefinedInTermsOfOther.ql
index f347ad909..56132b675 100644
--- a/cpp/autosar/src/rules/A13-5-4/OppositeOperatorsNotDefinedInTermsOfOther.ql
+++ b/cpp/autosar/src/rules/A13-5-4/OppositeOperatorsNotDefinedInTermsOfOther.ql
@@ -8,10 +8,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/a13-5-4
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A13-6-1/UseCorrectIntervalForDigitSequencesSeparators.ql b/cpp/autosar/src/rules/A13-6-1/UseCorrectIntervalForDigitSequencesSeparators.ql
index 24c6a8075..6fa0fc871 100644
--- a/cpp/autosar/src/rules/A13-6-1/UseCorrectIntervalForDigitSequencesSeparators.ql
+++ b/cpp/autosar/src/rules/A13-6-1/UseCorrectIntervalForDigitSequencesSeparators.ql
@@ -8,10 +8,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/a13-6-1
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A14-5-1/TemplateConstructorOverloadResolution.ql b/cpp/autosar/src/rules/A14-5-1/TemplateConstructorOverloadResolution.ql
index 6ce1f6e3c..41576f3c4 100644
--- a/cpp/autosar/src/rules/A14-5-1/TemplateConstructorOverloadResolution.ql
+++ b/cpp/autosar/src/rules/A14-5-1/TemplateConstructorOverloadResolution.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/a14-5-1
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.ql b/cpp/autosar/src/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.ql
index 62005d0b9..7f8271c36 100644
--- a/cpp/autosar/src/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.ql
+++ b/cpp/autosar/src/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.ql
@@ -10,10 +10,10 @@
  * @tags external/autosar/id/a14-7-2
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-1-1/OnlyThrowStdExceptionDerivedTypes.ql b/cpp/autosar/src/rules/A15-1-1/OnlyThrowStdExceptionDerivedTypes.ql
index 7e836b845..43ead0106 100644
--- a/cpp/autosar/src/rules/A15-1-1/OnlyThrowStdExceptionDerivedTypes.ql
+++ b/cpp/autosar/src/rules/A15-1-1/OnlyThrowStdExceptionDerivedTypes.ql
@@ -8,10 +8,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/a15-1-1
  *       maintainability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql b/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
index ca7df79d8..5a9e93afb 100644
--- a/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
+++ b/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a15-1-2
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql b/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql
index 4213b8273..3a452e04d 100644
--- a/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql
+++ b/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql
@@ -9,10 +9,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a15-2-2
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-3-3/MissingCatchHandlerInMain.ql b/cpp/autosar/src/rules/A15-3-3/MissingCatchHandlerInMain.ql
index 78fbfc530..719e682ee 100644
--- a/cpp/autosar/src/rules/A15-3-3/MissingCatchHandlerInMain.ql
+++ b/cpp/autosar/src/rules/A15-3-3/MissingCatchHandlerInMain.ql
@@ -10,10 +10,10 @@
  * @tags external/autosar/id/a15-3-3
  *       maintainability
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-3-4/CatchAllEllipsisUsedInNonMain.ql b/cpp/autosar/src/rules/A15-3-4/CatchAllEllipsisUsedInNonMain.ql
index c95a19f5e..147b34a3b 100644
--- a/cpp/autosar/src/rules/A15-3-4/CatchAllEllipsisUsedInNonMain.ql
+++ b/cpp/autosar/src/rules/A15-3-4/CatchAllEllipsisUsedInNonMain.ql
@@ -10,10 +10,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a15-3-4
  *       maintainability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/non-automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-4-1/UseOfDynamicExceptionSpecification.ql b/cpp/autosar/src/rules/A15-4-1/UseOfDynamicExceptionSpecification.ql
index a14efc0fe..decafc331 100644
--- a/cpp/autosar/src/rules/A15-4-1/UseOfDynamicExceptionSpecification.ql
+++ b/cpp/autosar/src/rules/A15-4-1/UseOfDynamicExceptionSpecification.ql
@@ -7,10 +7,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a15-4-1
  *       maintainability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecification.ql b/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecification.ql
index 500354aa3..91625986e 100644
--- a/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecification.ql
+++ b/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecification.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a15-4-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecificationForOverriders.ql b/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecificationForOverriders.ql
index e53065358..1364a524a 100644
--- a/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecificationForOverriders.ql
+++ b/cpp/autosar/src/rules/A15-4-3/IncompatibleNoexceptSpecificationForOverriders.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a15-4-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptFalseSpecification.ql b/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptFalseSpecification.ql
index 95aa75c7d..5a60360e9 100644
--- a/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptFalseSpecification.ql
+++ b/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptFalseSpecification.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a15-4-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptTrueSpecification.ql b/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptTrueSpecification.ql
index 6bb345a0d..0b5d7b80a 100644
--- a/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptTrueSpecification.ql
+++ b/cpp/autosar/src/rules/A15-4-3/InconsistentNoexceptTrueSpecification.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a15-4-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A16-2-1/CharactersOccurInHeaderFileNameOrInIncludeDirective.ql b/cpp/autosar/src/rules/A16-2-1/CharactersOccurInHeaderFileNameOrInIncludeDirective.ql
index 25e291335..d3a66f4ee 100644
--- a/cpp/autosar/src/rules/A16-2-1/CharactersOccurInHeaderFileNameOrInIncludeDirective.ql
+++ b/cpp/autosar/src/rules/A16-2-1/CharactersOccurInHeaderFileNameOrInIncludeDirective.ql
@@ -8,11 +8,11 @@
  * @problem.severity error
  * @tags external/autosar/id/a16-2-1
  *       correctness
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A16-6-1/ErrorDirectiveUsed.ql b/cpp/autosar/src/rules/A16-6-1/ErrorDirectiveUsed.ql
index 300d75825..4e6081680 100644
--- a/cpp/autosar/src/rules/A16-6-1/ErrorDirectiveUsed.ql
+++ b/cpp/autosar/src/rules/A16-6-1/ErrorDirectiveUsed.ql
@@ -7,10 +7,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a16-6-1
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-0-2/StringNumberConversionMissingErrorCheck.ql b/cpp/autosar/src/rules/A18-0-2/StringNumberConversionMissingErrorCheck.ql
index aafe2eb9a..63383dfcf 100644
--- a/cpp/autosar/src/rules/A18-0-2/StringNumberConversionMissingErrorCheck.ql
+++ b/cpp/autosar/src/rules/A18-0-2/StringNumberConversionMissingErrorCheck.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a18-0-2
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-0-2/UseOfUnsafeCStringToNumberConversion.ql b/cpp/autosar/src/rules/A18-0-2/UseOfUnsafeCStringToNumberConversion.ql
index 561cf2e6e..36af2faa9 100644
--- a/cpp/autosar/src/rules/A18-0-2/UseOfUnsafeCStringToNumberConversion.ql
+++ b/cpp/autosar/src/rules/A18-0-2/UseOfUnsafeCStringToNumberConversion.ql
@@ -8,10 +8,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a18-0-2
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
index 5c83ee543..454e500d6 100644
--- a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
+++ b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
@@ -10,10 +10,10 @@
  * @tags external/autosar/id/a18-1-2
  *       correctness
  *       scope/single-translation-unit
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-1-3/AutoPtrTypeUsed.ql b/cpp/autosar/src/rules/A18-1-3/AutoPtrTypeUsed.ql
index 0dff356a2..e8cb06efe 100644
--- a/cpp/autosar/src/rules/A18-1-3/AutoPtrTypeUsed.ql
+++ b/cpp/autosar/src/rules/A18-1-3/AutoPtrTypeUsed.ql
@@ -8,10 +8,10 @@
  * @tags external/autosar/id/a18-1-3
  *       maintainability
  *       scope/single-translation-unit
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql b/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql
index c4ec8d687..e2a331af3 100644
--- a/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql
+++ b/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a18-1-4
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedGlobally.ql b/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedGlobally.ql
index 179670024..fe94f2b8d 100644
--- a/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedGlobally.ql
+++ b/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedGlobally.ql
@@ -9,10 +9,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a18-5-11
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql b/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql
index c8e2d4bfc..8ccb88f2f 100644
--- a/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql
+++ b/cpp/autosar/src/rules/A18-5-11/OperatorNewAndOperatorDeleteNotDefinedLocally.ql
@@ -9,10 +9,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a18-5-11
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-3/NewArrayDeleteMismatch.ql b/cpp/autosar/src/rules/A18-5-3/NewArrayDeleteMismatch.ql
index dfec63f56..4d7f1ec76 100644
--- a/cpp/autosar/src/rules/A18-5-3/NewArrayDeleteMismatch.ql
+++ b/cpp/autosar/src/rules/A18-5-3/NewArrayDeleteMismatch.ql
@@ -9,10 +9,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a18-5-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-3/NewDeleteArrayMismatch.ql b/cpp/autosar/src/rules/A18-5-3/NewDeleteArrayMismatch.ql
index ac15e5913..540073443 100644
--- a/cpp/autosar/src/rules/A18-5-3/NewDeleteArrayMismatch.ql
+++ b/cpp/autosar/src/rules/A18-5-3/NewDeleteArrayMismatch.ql
@@ -8,10 +8,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a18-5-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql b/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql
index 6c9689a06..7627f2c2c 100644
--- a/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql
+++ b/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/a18-5-8
  *       maintainability
  *       readability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-9/ThrowingNoThrowOperatorNewDeleteAutosar.ql b/cpp/autosar/src/rules/A18-5-9/ThrowingNoThrowOperatorNewDeleteAutosar.ql
index be1ebff14..c49cac55f 100644
--- a/cpp/autosar/src/rules/A18-5-9/ThrowingNoThrowOperatorNewDeleteAutosar.ql
+++ b/cpp/autosar/src/rules/A18-5-9/ThrowingNoThrowOperatorNewDeleteAutosar.ql
@@ -9,10 +9,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a18-5-9
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewReturnsNullAutosar.ql b/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewReturnsNullAutosar.ql
index 7b73a52c7..b19717900 100644
--- a/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewReturnsNullAutosar.ql
+++ b/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewReturnsNullAutosar.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a18-5-9
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewThrowsInvalidExceptionAutosar.ql b/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewThrowsInvalidExceptionAutosar.ql
index 749127565..3cdf02872 100644
--- a/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewThrowsInvalidExceptionAutosar.ql
+++ b/cpp/autosar/src/rules/A18-5-9/ThrowingOperatorNewThrowsInvalidExceptionAutosar.ql
@@ -9,10 +9,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a18-5-9
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-9-1/BindUsed.ql b/cpp/autosar/src/rules/A18-9-1/BindUsed.ql
index 2b5b6379f..1fe650d73 100644
--- a/cpp/autosar/src/rules/A18-9-1/BindUsed.ql
+++ b/cpp/autosar/src/rules/A18-9-1/BindUsed.ql
@@ -8,10 +8,10 @@
  * @tags external/autosar/id/a18-9-1
  *       correctness
  *       scope/single-translation-unit
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql b/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
index d31796983..998326de0 100644
--- a/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
+++ b/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a18-9-2
  *       correctness
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-9-3/MoveUsedOnConstObjects.ql b/cpp/autosar/src/rules/A18-9-3/MoveUsedOnConstObjects.ql
index 18952c4ea..13892ba33 100644
--- a/cpp/autosar/src/rules/A18-9-3/MoveUsedOnConstObjects.ql
+++ b/cpp/autosar/src/rules/A18-9-3/MoveUsedOnConstObjects.ql
@@ -7,10 +7,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a18-9-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql b/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql
index c5a81aad8..dea597478 100644
--- a/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql
+++ b/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql
@@ -6,10 +6,10 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/autosar/id/a18-9-4
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql b/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
index 545d1880f..85ad6e708 100644
--- a/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
+++ b/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
@@ -7,12 +7,12 @@
  * @problem.severity error
  * @tags external/autosar/id/a2-13-1
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/architecture
  *       external/autosar/allocated-target/design
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A2-13-4/StringLiteralsAssignedToNonConstantPointers.ql b/cpp/autosar/src/rules/A2-13-4/StringLiteralsAssignedToNonConstantPointers.ql
index 1814f1838..626564043 100644
--- a/cpp/autosar/src/rules/A2-13-4/StringLiteralsAssignedToNonConstantPointers.ql
+++ b/cpp/autosar/src/rules/A2-13-4/StringLiteralsAssignedToNonConstantPointers.ql
@@ -8,12 +8,12 @@
  * @precision very-high
  * @problem.severity warning
  * @tags external/autosar/id/a2-13-4
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/architecture
  *       external/autosar/allocated-target/design
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A2-13-6/UniversalCharacterNamesUsedOutsideCharacterOrStringLiterals.ql b/cpp/autosar/src/rules/A2-13-6/UniversalCharacterNamesUsedOutsideCharacterOrStringLiterals.ql
index 61e7a3fd3..99f555402 100644
--- a/cpp/autosar/src/rules/A2-13-6/UniversalCharacterNamesUsedOutsideCharacterOrStringLiterals.ql
+++ b/cpp/autosar/src/rules/A2-13-6/UniversalCharacterNamesUsedOutsideCharacterOrStringLiterals.ql
@@ -9,12 +9,12 @@
  * @tags external/autosar/id/a2-13-6
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/architecture
  *       external/autosar/allocated-target/design
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql b/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
index 27925c0f8..b9884167c 100644
--- a/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
+++ b/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
@@ -10,11 +10,11 @@
  *       correctness
  *       readability
  *       maintainability
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A20-8-2/UniquePtrNotUsedToRepresentExclusiveOwnership.ql b/cpp/autosar/src/rules/A20-8-2/UniquePtrNotUsedToRepresentExclusiveOwnership.ql
index ea4a1c8e9..5297da6ae 100644
--- a/cpp/autosar/src/rules/A20-8-2/UniquePtrNotUsedToRepresentExclusiveOwnership.ql
+++ b/cpp/autosar/src/rules/A20-8-2/UniquePtrNotUsedToRepresentExclusiveOwnership.ql
@@ -8,10 +8,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a20-8-2
  *       maintainability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A21-8-1/SignedValPassedToChar.ql b/cpp/autosar/src/rules/A21-8-1/SignedValPassedToChar.ql
index 854fbb1cf..8fb3b7803 100644
--- a/cpp/autosar/src/rules/A21-8-1/SignedValPassedToChar.ql
+++ b/cpp/autosar/src/rules/A21-8-1/SignedValPassedToChar.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a21-8-1
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql b/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql
index a04330488..035add0ae 100644
--- a/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql
+++ b/cpp/autosar/src/rules/A23-0-1/IteratorImplicitlyConvertedToConstIterator.ql
@@ -6,10 +6,10 @@
  * @precision very-high
  * @problem.severity recommendation
  * @tags external/autosar/id/a23-0-1
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-1/ViolationsOfOneDefinitionRule.ql b/cpp/autosar/src/rules/A3-1-1/ViolationsOfOneDefinitionRule.ql
index cae4b01b5..81dcfbfe0 100644
--- a/cpp/autosar/src/rules/A3-1-1/ViolationsOfOneDefinitionRule.ql
+++ b/cpp/autosar/src/rules/A3-1-1/ViolationsOfOneDefinitionRule.ql
@@ -11,12 +11,12 @@
  *       correctness
  *       maintainability
  *       readability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/architecture
  *       external/autosar/allocated-target/design
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-2/HeaderFileExpectedFileNameExtension.ql b/cpp/autosar/src/rules/A3-1-2/HeaderFileExpectedFileNameExtension.ql
index 8a12dae8e..1a043b045 100644
--- a/cpp/autosar/src/rules/A3-1-2/HeaderFileExpectedFileNameExtension.ql
+++ b/cpp/autosar/src/rules/A3-1-2/HeaderFileExpectedFileNameExtension.ql
@@ -9,12 +9,12 @@
  * @tags external/autosar/id/a3-1-2
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/architecture
  *       external/autosar/allocated-target/design
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-3/FileNameExtensionCpp.ql b/cpp/autosar/src/rules/A3-1-3/FileNameExtensionCpp.ql
index 120254d7f..535263535 100644
--- a/cpp/autosar/src/rules/A3-1-3/FileNameExtensionCpp.ql
+++ b/cpp/autosar/src/rules/A3-1-3/FileNameExtensionCpp.ql
@@ -9,12 +9,12 @@
  * @tags external/autosar/id/a3-1-3
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/architecture
  *       external/autosar/allocated-target/design
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-4/ExternalLinkageArrayWithoutExplicitSize.ql b/cpp/autosar/src/rules/A3-1-4/ExternalLinkageArrayWithoutExplicitSize.ql
index fbe504d56..66f13442c 100644
--- a/cpp/autosar/src/rules/A3-1-4/ExternalLinkageArrayWithoutExplicitSize.ql
+++ b/cpp/autosar/src/rules/A3-1-4/ExternalLinkageArrayWithoutExplicitSize.ql
@@ -8,11 +8,11 @@
  * @problem.severity warning
  * @tags external/autosar/id/a3-1-4
  *       correctness
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/design
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-5/NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.ql b/cpp/autosar/src/rules/A3-1-5/NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.ql
index e694e92fe..3a49e3104 100644
--- a/cpp/autosar/src/rules/A3-1-5/NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.ql
+++ b/cpp/autosar/src/rules/A3-1-5/NonTrivialNonTemplateFunctionDefinedInsideClassDefinition.ql
@@ -8,10 +8,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/a3-1-5
  *       external/autosar/audit
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/design
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A3-1-6/TrivialAccessorAndMutatorFunctionsNotInlined.ql b/cpp/autosar/src/rules/A3-1-6/TrivialAccessorAndMutatorFunctionsNotInlined.ql
index 7b2da0c6e..4fa140733 100644
--- a/cpp/autosar/src/rules/A3-1-6/TrivialAccessorAndMutatorFunctionsNotInlined.ql
+++ b/cpp/autosar/src/rules/A3-1-6/TrivialAccessorAndMutatorFunctionsNotInlined.ql
@@ -7,10 +7,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/a3-1-6
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/design
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-0-3/DeclarationContainLessThanTwoLevelsOfIndirection.ql b/cpp/autosar/src/rules/A5-0-3/DeclarationContainLessThanTwoLevelsOfIndirection.ql
index 301949f61..c2a05239f 100644
--- a/cpp/autosar/src/rules/A5-0-3/DeclarationContainLessThanTwoLevelsOfIndirection.ql
+++ b/cpp/autosar/src/rules/A5-0-3/DeclarationContainLessThanTwoLevelsOfIndirection.ql
@@ -10,10 +10,10 @@
  * @tags external/autosar/id/a5-0-3
  *       readability
  *       maintainability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-1-2/ImplicitLambdaCapture.ql b/cpp/autosar/src/rules/A5-1-2/ImplicitLambdaCapture.ql
index 8d65e4932..0fd199059 100644
--- a/cpp/autosar/src/rules/A5-1-2/ImplicitLambdaCapture.ql
+++ b/cpp/autosar/src/rules/A5-1-2/ImplicitLambdaCapture.ql
@@ -8,10 +8,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a5-1-2
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-1-3/LambdaExpressionWithoutParameterList.ql b/cpp/autosar/src/rules/A5-1-3/LambdaExpressionWithoutParameterList.ql
index 1aec8c4ef..b21ea6b71 100644
--- a/cpp/autosar/src/rules/A5-1-3/LambdaExpressionWithoutParameterList.ql
+++ b/cpp/autosar/src/rules/A5-1-3/LambdaExpressionWithoutParameterList.ql
@@ -8,10 +8,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a5-1-3
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-1-8/LambdaExpressionInLambdaExpression.ql b/cpp/autosar/src/rules/A5-1-8/LambdaExpressionInLambdaExpression.ql
index 88a98dbdd..6f0416f77 100644
--- a/cpp/autosar/src/rules/A5-1-8/LambdaExpressionInLambdaExpression.ql
+++ b/cpp/autosar/src/rules/A5-1-8/LambdaExpressionInLambdaExpression.ql
@@ -8,10 +8,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/a5-1-8
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-1-9/IdenticalLambdaExpressions.ql b/cpp/autosar/src/rules/A5-1-9/IdenticalLambdaExpressions.ql
index d7ef42c93..68f249d42 100644
--- a/cpp/autosar/src/rules/A5-1-9/IdenticalLambdaExpressions.ql
+++ b/cpp/autosar/src/rules/A5-1-9/IdenticalLambdaExpressions.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/a5-1-9
  *       readability
  *       maintainability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
index 93d467a62..f763d089c 100644
--- a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
+++ b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
@@ -9,10 +9,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a5-10-1
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-3-2/NullPointersDereferenced.ql b/cpp/autosar/src/rules/A5-3-2/NullPointersDereferenced.ql
index c73365564..1ade80df9 100644
--- a/cpp/autosar/src/rules/A5-3-2/NullPointersDereferenced.ql
+++ b/cpp/autosar/src/rules/A5-3-2/NullPointersDereferenced.ql
@@ -7,10 +7,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a5-3-2
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-5-1/PointerToMemberAccessNonExistentClassMembers.ql b/cpp/autosar/src/rules/A5-5-1/PointerToMemberAccessNonExistentClassMembers.ql
index 46f4cd7dd..288b815d5 100644
--- a/cpp/autosar/src/rules/A5-5-1/PointerToMemberAccessNonExistentClassMembers.ql
+++ b/cpp/autosar/src/rules/A5-5-1/PointerToMemberAccessNonExistentClassMembers.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a5-5-1
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A5-5-1/UninitializedStaticPointerToMemberUse.ql b/cpp/autosar/src/rules/A5-5-1/UninitializedStaticPointerToMemberUse.ql
index 268ebe30c..92373c893 100644
--- a/cpp/autosar/src/rules/A5-5-1/UninitializedStaticPointerToMemberUse.ql
+++ b/cpp/autosar/src/rules/A5-5-1/UninitializedStaticPointerToMemberUse.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a5-5-1
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A6-2-2/ExplicitConstructionOfUnnamedTemporary.ql b/cpp/autosar/src/rules/A6-2-2/ExplicitConstructionOfUnnamedTemporary.ql
index 5e1a54259..6657dd8d6 100644
--- a/cpp/autosar/src/rules/A6-2-2/ExplicitConstructionOfUnnamedTemporary.ql
+++ b/cpp/autosar/src/rules/A6-2-2/ExplicitConstructionOfUnnamedTemporary.ql
@@ -9,10 +9,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/a6-2-2
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A6-5-1/UnusedLoopCounterForContainerIteration.ql b/cpp/autosar/src/rules/A6-5-1/UnusedLoopCounterForContainerIteration.ql
index 028e2049b..f739d8574 100644
--- a/cpp/autosar/src/rules/A6-5-1/UnusedLoopCounterForContainerIteration.ql
+++ b/cpp/autosar/src/rules/A6-5-1/UnusedLoopCounterForContainerIteration.ql
@@ -8,10 +8,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/a6-5-1
  *       maintainability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql b/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
index 046a9bb1f..4496ded3f 100644
--- a/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
+++ b/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
@@ -9,10 +9,10 @@
  *       correctness
  *       security
  *       scope/single-translation-unit
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-1-4/RegisterKeywordUsed.ql b/cpp/autosar/src/rules/A7-1-4/RegisterKeywordUsed.ql
index deea04b15..f0bedcbb1 100644
--- a/cpp/autosar/src/rules/A7-1-4/RegisterKeywordUsed.ql
+++ b/cpp/autosar/src/rules/A7-1-4/RegisterKeywordUsed.ql
@@ -8,10 +8,10 @@
  * @tags external/autosar/id/a7-1-4
  *       correctness
  *       scope/single-translation-unit
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-1-9/ClassStructEnumDeclaredInDefinition.ql b/cpp/autosar/src/rules/A7-1-9/ClassStructEnumDeclaredInDefinition.ql
index 108df61dc..59b637d27 100644
--- a/cpp/autosar/src/rules/A7-1-9/ClassStructEnumDeclaredInDefinition.ql
+++ b/cpp/autosar/src/rules/A7-1-9/ClassStructEnumDeclaredInDefinition.ql
@@ -8,10 +8,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/a7-1-9
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-2-3/EnumerationsNotDeclaredAsScopedEnumClasses.ql b/cpp/autosar/src/rules/A7-2-3/EnumerationsNotDeclaredAsScopedEnumClasses.ql
index 2e453999b..aad307c31 100644
--- a/cpp/autosar/src/rules/A7-2-3/EnumerationsNotDeclaredAsScopedEnumClasses.ql
+++ b/cpp/autosar/src/rules/A7-2-3/EnumerationsNotDeclaredAsScopedEnumClasses.ql
@@ -9,10 +9,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/a7-2-3
  *       maintainability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-2-4/NoneFirstOrAllEnumeratorsNotInitialized.ql b/cpp/autosar/src/rules/A7-2-4/NoneFirstOrAllEnumeratorsNotInitialized.ql
index e439d0f2a..fe853d630 100644
--- a/cpp/autosar/src/rules/A7-2-4/NoneFirstOrAllEnumeratorsNotInitialized.ql
+++ b/cpp/autosar/src/rules/A7-2-4/NoneFirstOrAllEnumeratorsNotInitialized.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/a7-2-4
  *       readability
  *       maintainability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-2-5/IntegerUsedForEnum.ql b/cpp/autosar/src/rules/A7-2-5/IntegerUsedForEnum.ql
index eb9f37628..7abe392c9 100644
--- a/cpp/autosar/src/rules/A7-2-5/IntegerUsedForEnum.ql
+++ b/cpp/autosar/src/rules/A7-2-5/IntegerUsedForEnum.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/a7-2-5
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/design
  *       external/autosar/enforcement/non-automated
  *       external/autosar/obligation/advisory
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql b/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql
index 0eca2915a..e20a18ff6 100644
--- a/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql
+++ b/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/a7-5-1
  *       correctness
  *       security
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A8-4-5/MoveFromConsumeParametersRvalRef.ql b/cpp/autosar/src/rules/A8-4-5/MoveFromConsumeParametersRvalRef.ql
index 472340eb2..870d23fe1 100644
--- a/cpp/autosar/src/rules/A8-4-5/MoveFromConsumeParametersRvalRef.ql
+++ b/cpp/autosar/src/rules/A8-4-5/MoveFromConsumeParametersRvalRef.ql
@@ -7,10 +7,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a8-4-5
  *       correctness
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/design
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A8-4-6/ForwardForwardingReferences.ql b/cpp/autosar/src/rules/A8-4-6/ForwardForwardingReferences.ql
index 40aaea446..70713248e 100644
--- a/cpp/autosar/src/rules/A8-4-6/ForwardForwardingReferences.ql
+++ b/cpp/autosar/src/rules/A8-4-6/ForwardForwardingReferences.ql
@@ -7,10 +7,10 @@
  * @problem.severity error
  * @tags external/autosar/id/a8-4-6
  *       correctness
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/design
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql b/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
index 582a00503..3274bedaa 100644
--- a/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
+++ b/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
@@ -10,10 +10,10 @@
  * @tags external/autosar/id/a8-5-4
  *       readability
  *       maintainability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/advisory
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
index 1315c3923..d7800bc0d 100644
--- a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
+++ b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
@@ -7,10 +7,10 @@
  * @precision very-high
  * @problem.severity warning
  * @tags external/autosar/id/m10-1-3
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M10-3-3/VirtualFunctionOverriddenByAPureVirtualFunction.ql b/cpp/autosar/src/rules/M10-3-3/VirtualFunctionOverriddenByAPureVirtualFunction.ql
index 5661aca4b..08ab93057 100644
--- a/cpp/autosar/src/rules/M10-3-3/VirtualFunctionOverriddenByAPureVirtualFunction.ql
+++ b/cpp/autosar/src/rules/M10-3-3/VirtualFunctionOverriddenByAPureVirtualFunction.ql
@@ -8,10 +8,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/m10-3-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql b/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
index 40a394ba4..484252bb3 100644
--- a/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
+++ b/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
@@ -7,10 +7,10 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/autosar/id/m12-1-1
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql b/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql
index 7a483303b..21183978d 100644
--- a/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql
+++ b/cpp/autosar/src/rules/M14-5-3/CopyAssignmentOperatorNotDeclared.ql
@@ -10,10 +10,10 @@
  * @tags external/autosar/id/m14-5-3
  *       maintainability
  *       readability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-0-3/GotoToCatchBlock.ql b/cpp/autosar/src/rules/M15-0-3/GotoToCatchBlock.ql
index 0e5753750..6e1aab490 100644
--- a/cpp/autosar/src/rules/M15-0-3/GotoToCatchBlock.ql
+++ b/cpp/autosar/src/rules/M15-0-3/GotoToCatchBlock.ql
@@ -7,10 +7,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m15-0-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-0-3/SwitchToCatchBlock.ql b/cpp/autosar/src/rules/M15-0-3/SwitchToCatchBlock.ql
index 454a4c3bc..2027539d5 100644
--- a/cpp/autosar/src/rules/M15-0-3/SwitchToCatchBlock.ql
+++ b/cpp/autosar/src/rules/M15-0-3/SwitchToCatchBlock.ql
@@ -7,10 +7,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m15-0-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-1-1/ExceptionThrownDuringThrow.ql b/cpp/autosar/src/rules/M15-1-1/ExceptionThrownDuringThrow.ql
index c30fcac30..30279a57d 100644
--- a/cpp/autosar/src/rules/M15-1-1/ExceptionThrownDuringThrow.ql
+++ b/cpp/autosar/src/rules/M15-1-1/ExceptionThrownDuringThrow.ql
@@ -8,10 +8,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/m15-1-1
  *       maintainability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-1-2/NullThrownExplicitly.ql b/cpp/autosar/src/rules/M15-1-2/NullThrownExplicitly.ql
index 5d0098173..5883d91f3 100644
--- a/cpp/autosar/src/rules/M15-1-2/NullThrownExplicitly.ql
+++ b/cpp/autosar/src/rules/M15-1-2/NullThrownExplicitly.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m15-1-2
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql b/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
index e9d96f328..578b2771b 100644
--- a/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
+++ b/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m15-1-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringStartup.ql b/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringStartup.ql
index bc06b5f0d..7fd52837c 100644
--- a/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringStartup.ql
+++ b/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringStartup.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m15-3-1
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringTermination.ql b/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringTermination.ql
index 856b2d322..bf7863505 100644
--- a/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringTermination.ql
+++ b/cpp/autosar/src/rules/M15-3-1/ExceptionRaisedDuringTermination.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m15-3-1
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-3-3/DestroyedValueReferencedInDestructorCatchBlock.ql b/cpp/autosar/src/rules/M15-3-3/DestroyedValueReferencedInDestructorCatchBlock.ql
index 0d07ca005..9495f0d7e 100644
--- a/cpp/autosar/src/rules/M15-3-3/DestroyedValueReferencedInDestructorCatchBlock.ql
+++ b/cpp/autosar/src/rules/M15-3-3/DestroyedValueReferencedInDestructorCatchBlock.ql
@@ -9,10 +9,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m15-3-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-3-4/CatchAllExplicitlyThrownExceptions.ql b/cpp/autosar/src/rules/M15-3-4/CatchAllExplicitlyThrownExceptions.ql
index d242c4ec6..19341b99d 100644
--- a/cpp/autosar/src/rules/M15-3-4/CatchAllExplicitlyThrownExceptions.ql
+++ b/cpp/autosar/src/rules/M15-3-4/CatchAllExplicitlyThrownExceptions.ql
@@ -7,10 +7,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m15-3-4
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M15-3-7/CatchAllHandlerLast.ql b/cpp/autosar/src/rules/M15-3-7/CatchAllHandlerLast.ql
index 1a69853de..8436f7e27 100644
--- a/cpp/autosar/src/rules/M15-3-7/CatchAllHandlerLast.ql
+++ b/cpp/autosar/src/rules/M15-3-7/CatchAllHandlerLast.ql
@@ -7,10 +7,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/m15-3-7
  *       maintainability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M16-0-5/FunctionLikeMacroArgsContainHashToken.ql b/cpp/autosar/src/rules/M16-0-5/FunctionLikeMacroArgsContainHashToken.ql
index 2b3dba0f9..659a124d4 100644
--- a/cpp/autosar/src/rules/M16-0-5/FunctionLikeMacroArgsContainHashToken.ql
+++ b/cpp/autosar/src/rules/M16-0-5/FunctionLikeMacroArgsContainHashToken.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/m16-0-5
  *       readability
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorInOneOfTheTwoStandardForms.ql b/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorInOneOfTheTwoStandardForms.ql
index a2d10d6cc..45b848c27 100644
--- a/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorInOneOfTheTwoStandardForms.ql
+++ b/cpp/autosar/src/rules/M16-1-1/DefinedPreProcessorOperatorInOneOfTheTwoStandardForms.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m16-1-1
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.ql b/cpp/autosar/src/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.ql
index d6ec60794..a1e5fe675 100644
--- a/cpp/autosar/src/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.ql
+++ b/cpp/autosar/src/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.ql
@@ -8,10 +8,10 @@
  * @tags external/autosar/id/m17-0-5
  *       correctness
  *       scope/single-translation-unit
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M18-0-3/LibraryFunctionsAbortExitGetenvAndSystemFromLibraryCstdlibUsed.ql b/cpp/autosar/src/rules/M18-0-3/LibraryFunctionsAbortExitGetenvAndSystemFromLibraryCstdlibUsed.ql
index a0ee1c2b3..023298174 100644
--- a/cpp/autosar/src/rules/M18-0-3/LibraryFunctionsAbortExitGetenvAndSystemFromLibraryCstdlibUsed.ql
+++ b/cpp/autosar/src/rules/M18-0-3/LibraryFunctionsAbortExitGetenvAndSystemFromLibraryCstdlibUsed.ql
@@ -9,10 +9,10 @@
  *       correctness
  *       security
  *       scope/single-translation-unit
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M18-0-4/TimeHandlingFunctionsOfLibraryCtimeUsed.ql b/cpp/autosar/src/rules/M18-0-4/TimeHandlingFunctionsOfLibraryCtimeUsed.ql
index 209d29c05..bab291ef1 100644
--- a/cpp/autosar/src/rules/M18-0-4/TimeHandlingFunctionsOfLibraryCtimeUsed.ql
+++ b/cpp/autosar/src/rules/M18-0-4/TimeHandlingFunctionsOfLibraryCtimeUsed.ql
@@ -9,10 +9,10 @@
  *       correctness
  *       security
  *       scope/single-translation-unit
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalEscape.ql b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalEscape.ql
index 6baeebe73..2f4fa314e 100644
--- a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalEscape.ql
+++ b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalEscape.ql
@@ -8,12 +8,12 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/m2-13-2
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/architecture
  *       external/autosar/allocated-target/design
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
index dabf04ed1..9d3ee17ad 100644
--- a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
+++ b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
@@ -7,12 +7,12 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/m2-13-2
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/architecture
  *       external/autosar/allocated-target/design
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql b/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
index 541cde7a1..e1379a438 100644
--- a/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
+++ b/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
@@ -10,10 +10,10 @@
  * @tags external/autosar/id/m3-1-2
  *       correctness
  *       maintainability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M3-3-2/MissingStaticSpecifierOnFunctionRedeclaration.ql b/cpp/autosar/src/rules/M3-3-2/MissingStaticSpecifierOnFunctionRedeclaration.ql
index a20d530ba..cb0fc10ff 100644
--- a/cpp/autosar/src/rules/M3-3-2/MissingStaticSpecifierOnFunctionRedeclaration.ql
+++ b/cpp/autosar/src/rules/M3-3-2/MissingStaticSpecifierOnFunctionRedeclaration.ql
@@ -8,11 +8,11 @@
  * @problem.severity warning
  * @tags external/autosar/id/m3-3-2
  *       readability
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql b/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql
index 40bc612de..d3cc63a76 100644
--- a/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql
+++ b/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql
@@ -7,10 +7,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m3-9-3
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M4-10-1/NullUsedAsIntegerValue.ql b/cpp/autosar/src/rules/M4-10-1/NullUsedAsIntegerValue.ql
index b9febed7d..1414f9331 100644
--- a/cpp/autosar/src/rules/M4-10-1/NullUsedAsIntegerValue.ql
+++ b/cpp/autosar/src/rules/M4-10-1/NullUsedAsIntegerValue.ql
@@ -7,10 +7,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/m4-10-1
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M4-10-2/LiteralZeroUsedAsNullPointerConstant.ql b/cpp/autosar/src/rules/M4-10-2/LiteralZeroUsedAsNullPointerConstant.ql
index 60741e1f8..4e803f7a4 100644
--- a/cpp/autosar/src/rules/M4-10-2/LiteralZeroUsedAsNullPointerConstant.ql
+++ b/cpp/autosar/src/rules/M4-10-2/LiteralZeroUsedAsNullPointerConstant.ql
@@ -7,10 +7,10 @@
  * @problem.severity recommendation
  * @tags external/autosar/id/m4-10-2
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-0-16/PointerAndDerivedPointerAccessDifferentArray.ql b/cpp/autosar/src/rules/M5-0-16/PointerAndDerivedPointerAccessDifferentArray.ql
index 8b6be58cb..31aaf5388 100644
--- a/cpp/autosar/src/rules/M5-0-16/PointerAndDerivedPointerAccessDifferentArray.ql
+++ b/cpp/autosar/src/rules/M5-0-16/PointerAndDerivedPointerAccessDifferentArray.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m5-0-16
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql b/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql
index aed9b5827..1ef3bcf55 100644
--- a/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql
+++ b/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m5-0-17
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-18-1/CommaOperatorUsed.ql b/cpp/autosar/src/rules/M5-18-1/CommaOperatorUsed.ql
index f0dc70d12..cb0accb59 100644
--- a/cpp/autosar/src/rules/M5-18-1/CommaOperatorUsed.ql
+++ b/cpp/autosar/src/rules/M5-18-1/CommaOperatorUsed.ql
@@ -8,10 +8,10 @@
  * @tags external/autosar/id/m5-18-1
  *       correctness
  *       scope/single-translation-unit
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-19-1/ConstantUnsignedIntegerExpressionsWrapAround.ql b/cpp/autosar/src/rules/M5-19-1/ConstantUnsignedIntegerExpressionsWrapAround.ql
index 82fcc049d..c92216235 100644
--- a/cpp/autosar/src/rules/M5-19-1/ConstantUnsignedIntegerExpressionsWrapAround.ql
+++ b/cpp/autosar/src/rules/M5-19-1/ConstantUnsignedIntegerExpressionsWrapAround.ql
@@ -14,10 +14,10 @@
  * @tags external/autosar/id/m5-19-1
  *       correctness
  *       security
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql b/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql
index b8ec1eeb6..a8b269970 100644
--- a/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql
+++ b/cpp/autosar/src/rules/M5-2-10/IncrementAndDecrementOperatorsMixedWithOtherOperatorsInExpression.ql
@@ -9,11 +9,11 @@
  * @tags external/autosar/id/m5-2-10
  *       readability
  *       correctness
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-2-11/CommaOperatorAndOperatorAndTheOperatorOverloaded.ql b/cpp/autosar/src/rules/M5-2-11/CommaOperatorAndOperatorAndTheOperatorOverloaded.ql
index 539c71648..aa30d877f 100644
--- a/cpp/autosar/src/rules/M5-2-11/CommaOperatorAndOperatorAndTheOperatorOverloaded.ql
+++ b/cpp/autosar/src/rules/M5-2-11/CommaOperatorAndOperatorAndTheOperatorOverloaded.ql
@@ -6,10 +6,10 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/autosar/id/m5-2-11
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql b/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql
index 851102540..574facf3b 100644
--- a/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql
+++ b/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql
@@ -8,10 +8,10 @@
  * @problem.severity error
  * @tags external/autosar/id/m5-2-2
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
index dcbcf163a..14d54ebaf 100644
--- a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
+++ b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
@@ -7,10 +7,10 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/autosar/id/m5-3-2
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql b/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
index efa1fc507..cf9384116 100644
--- a/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
+++ b/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
@@ -6,10 +6,10 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/autosar/id/m5-3-3
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-2-1/AssignmentInSubExpression.ql b/cpp/autosar/src/rules/M6-2-1/AssignmentInSubExpression.ql
index 3c5ac437d..d309f9e2a 100644
--- a/cpp/autosar/src/rules/M6-2-1/AssignmentInSubExpression.ql
+++ b/cpp/autosar/src/rules/M6-2-1/AssignmentInSubExpression.ql
@@ -8,10 +8,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/m6-2-1
  *       correctness
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-2-2/FloatsTestedForEquality.ql b/cpp/autosar/src/rules/M6-2-2/FloatsTestedForEquality.ql
index 5a442b3f0..b5ccf1ba4 100644
--- a/cpp/autosar/src/rules/M6-2-2/FloatsTestedForEquality.ql
+++ b/cpp/autosar/src/rules/M6-2-2/FloatsTestedForEquality.ql
@@ -10,10 +10,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/m6-2-2
  *       maintainability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/partially-automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql b/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
index d541d8de3..0985c7760 100644
--- a/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/m6-3-1
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql b/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
index 04df5015e..3ba29678a 100644
--- a/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/m6-3-1
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-1/IfCompoundCondition.ql b/cpp/autosar/src/rules/M6-4-1/IfCompoundCondition.ql
index 10109de97..0f75bc56c 100644
--- a/cpp/autosar/src/rules/M6-4-1/IfCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-4-1/IfCompoundCondition.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/m6-4-1
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-3/SwitchDoesNotStartWithCase.ql b/cpp/autosar/src/rules/M6-4-3/SwitchDoesNotStartWithCase.ql
index c19acc778..abdc5cf91 100644
--- a/cpp/autosar/src/rules/M6-4-3/SwitchDoesNotStartWithCase.ql
+++ b/cpp/autosar/src/rules/M6-4-3/SwitchDoesNotStartWithCase.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/m6-4-3
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-3/SwitchStatementNotWellFormed.ql b/cpp/autosar/src/rules/M6-4-3/SwitchStatementNotWellFormed.ql
index 04c1d6b6a..24b593253 100644
--- a/cpp/autosar/src/rules/M6-4-3/SwitchStatementNotWellFormed.ql
+++ b/cpp/autosar/src/rules/M6-4-3/SwitchStatementNotWellFormed.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/m6-4-3
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-4/NestedCaseInSwitch.ql b/cpp/autosar/src/rules/M6-4-4/NestedCaseInSwitch.ql
index 77c70a9bf..18a9515f8 100644
--- a/cpp/autosar/src/rules/M6-4-4/NestedCaseInSwitch.ql
+++ b/cpp/autosar/src/rules/M6-4-4/NestedCaseInSwitch.ql
@@ -8,11 +8,11 @@
  * @tags external/autosar/id/m6-4-4
  *       maintainability
  *       readability
+ *       coding-standards/baseline/safety
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-5/NonEmptySwitchClauseDoesNotTerminate.ql b/cpp/autosar/src/rules/M6-4-5/NonEmptySwitchClauseDoesNotTerminate.ql
index 684b9b170..90ef7ea4a 100644
--- a/cpp/autosar/src/rules/M6-4-5/NonEmptySwitchClauseDoesNotTerminate.ql
+++ b/cpp/autosar/src/rules/M6-4-5/NonEmptySwitchClauseDoesNotTerminate.ql
@@ -10,10 +10,10 @@
  * @tags external/autosar/id/m6-4-5
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-4-7/BooleanInSwitchCondition.ql b/cpp/autosar/src/rules/M6-4-7/BooleanInSwitchCondition.ql
index c253c1eeb..9a8636416 100644
--- a/cpp/autosar/src/rules/M6-4-7/BooleanInSwitchCondition.ql
+++ b/cpp/autosar/src/rules/M6-4-7/BooleanInSwitchCondition.ql
@@ -8,10 +8,10 @@
  * @tags external/autosar/id/m6-4-7
  *       maintainability
  *       readability
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-5-2/NotEqualsInLoopCondition.ql b/cpp/autosar/src/rules/M6-5-2/NotEqualsInLoopCondition.ql
index f83662ea4..297d0d578 100644
--- a/cpp/autosar/src/rules/M6-5-2/NotEqualsInLoopCondition.ql
+++ b/cpp/autosar/src/rules/M6-5-2/NotEqualsInLoopCondition.ql
@@ -7,10 +7,10 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/autosar/id/m6-5-2
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-5-3/LoopCounterModifiedWithinCondition.ql b/cpp/autosar/src/rules/M6-5-3/LoopCounterModifiedWithinCondition.ql
index ffb032b26..fb7a9c94b 100644
--- a/cpp/autosar/src/rules/M6-5-3/LoopCounterModifiedWithinCondition.ql
+++ b/cpp/autosar/src/rules/M6-5-3/LoopCounterModifiedWithinCondition.ql
@@ -6,10 +6,10 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/autosar/id/m6-5-3
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopCondition.ql b/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopCondition.ql
index 1ee18f2d8..c7dd7c915 100644
--- a/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopCondition.ql
+++ b/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopCondition.ql
@@ -7,10 +7,10 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/autosar/id/m6-5-5
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopExpression.ql b/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopExpression.ql
index 11458704f..4569e288d 100644
--- a/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopExpression.ql
+++ b/cpp/autosar/src/rules/M6-5-5/LoopControlVariableModifiedInLoopExpression.ql
@@ -7,10 +7,10 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/autosar/id/m6-5-5
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-6-1/GotoBlockCondition.ql b/cpp/autosar/src/rules/M6-6-1/GotoBlockCondition.ql
index b308823ec..6f7e5babc 100644
--- a/cpp/autosar/src/rules/M6-6-1/GotoBlockCondition.ql
+++ b/cpp/autosar/src/rules/M6-6-1/GotoBlockCondition.ql
@@ -8,10 +8,10 @@
  * @tags external/autosar/id/m6-6-1
  *       maintainability
  *       readability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M6-6-2/GotoStatementJumpCondition.ql b/cpp/autosar/src/rules/M6-6-2/GotoStatementJumpCondition.ql
index b937f53b9..7de2afb08 100644
--- a/cpp/autosar/src/rules/M6-6-2/GotoStatementJumpCondition.ql
+++ b/cpp/autosar/src/rules/M6-6-2/GotoStatementJumpCondition.ql
@@ -8,10 +8,10 @@
  * @tags external/autosar/id/m6-6-2
  *       maintainability
  *       readability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql b/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql
index 427d352c7..d6b2b4149 100644
--- a/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql
+++ b/cpp/autosar/src/rules/M7-3-6/UsingDeclarationsUsedInHeaderFiles.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/m7-3-6
  *       correctness
  *       scope/single-translation-unit
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql b/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
index 19b00c70a..b89ed96f0 100644
--- a/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
+++ b/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
@@ -9,10 +9,10 @@
  * @tags external/autosar/id/m7-5-1
  *       correctness
  *       security
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/non-automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M7-5-2/AssignmentOfEscapingAutoStorage.ql b/cpp/autosar/src/rules/M7-5-2/AssignmentOfEscapingAutoStorage.ql
index 2e3cbada0..774fa5bd4 100644
--- a/cpp/autosar/src/rules/M7-5-2/AssignmentOfEscapingAutoStorage.ql
+++ b/cpp/autosar/src/rules/M7-5-2/AssignmentOfEscapingAutoStorage.ql
@@ -8,10 +8,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/m7-5-2
  *       correctness
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/non-automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
index 796c531bc..e81517775 100644
--- a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
+++ b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
@@ -9,10 +9,10 @@
  * @problem.severity warning
  * @tags external/autosar/id/m8-3-1
  *       correctness
+ *       coding-standards/baseline/style
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/style
  */
 
 import cpp
diff --git a/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql b/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql
index 4aeec8470..458c68a08 100644
--- a/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql
+++ b/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql
@@ -11,10 +11,10 @@
  *       correctness
  *       maintainability
  *       readability
+ *       coding-standards/baseline/safety
  *       external/autosar/allocated-target/implementation
  *       external/autosar/enforcement/automated
  *       external/autosar/obligation/required
- *       coding-standards/baseline/safety
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON50-CPP/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql b/cpp/cert/src/rules/CON50-CPP/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
index e96561267..c3ddebed4 100644
--- a/cpp/cert/src/rules/CON50-CPP/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
+++ b/cpp/cert/src/rules/CON50-CPP/DoNotAllowAMutexToGoOutOfScopeWhileLocked.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON50-CPP/DoNotDestroyAMutexWhileItIsLocked.ql b/cpp/cert/src/rules/CON50-CPP/DoNotDestroyAMutexWhileItIsLocked.ql
index 86e6bdec4..ab19193ce 100644
--- a/cpp/cert/src/rules/CON50-CPP/DoNotDestroyAMutexWhileItIsLocked.ql
+++ b/cpp/cert/src/rules/CON50-CPP/DoNotDestroyAMutexWhileItIsLocked.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON51-CPP/EnsureActivelyHeldLocksAreReleasedOnExceptionalConditions.ql b/cpp/cert/src/rules/CON51-CPP/EnsureActivelyHeldLocksAreReleasedOnExceptionalConditions.ql
index 63a862e09..348b5a5db 100644
--- a/cpp/cert/src/rules/CON51-CPP/EnsureActivelyHeldLocksAreReleasedOnExceptionalConditions.ql
+++ b/cpp/cert/src/rules/CON51-CPP/EnsureActivelyHeldLocksAreReleasedOnExceptionalConditions.ql
@@ -15,8 +15,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON52-CPP/PreventBitFieldAccessFromMultipleThreads.ql b/cpp/cert/src/rules/CON52-CPP/PreventBitFieldAccessFromMultipleThreads.ql
index d94f65bce..f9050fe1f 100644
--- a/cpp/cert/src/rules/CON52-CPP/PreventBitFieldAccessFromMultipleThreads.ql
+++ b/cpp/cert/src/rules/CON52-CPP/PreventBitFieldAccessFromMultipleThreads.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p8
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON53-CPP/DeadlockByLockingInPredefinedOrder.ql b/cpp/cert/src/rules/CON53-CPP/DeadlockByLockingInPredefinedOrder.ql
index bb89d0c68..eaaf3a372 100644
--- a/cpp/cert/src/rules/CON53-CPP/DeadlockByLockingInPredefinedOrder.ql
+++ b/cpp/cert/src/rules/CON53-CPP/DeadlockByLockingInPredefinedOrder.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON54-CPP/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql b/cpp/cert/src/rules/CON54-CPP/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
index a4fa80f52..cbd8384dd 100644
--- a/cpp/cert/src/rules/CON54-CPP/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
+++ b/cpp/cert/src/rules/CON54-CPP/WrapFunctionsThatCanSpuriouslyWakeUpInLoop.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CON55-CPP/PreserveSafetyWhenUsingConditionVariables.ql b/cpp/cert/src/rules/CON55-CPP/PreserveSafetyWhenUsingConditionVariables.ql
index bdb3b997c..bc0916cad 100644
--- a/cpp/cert/src/rules/CON55-CPP/PreserveSafetyWhenUsingConditionVariables.ql
+++ b/cpp/cert/src/rules/CON55-CPP/PreserveSafetyWhenUsingConditionVariables.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR51-CPP/UsesValidContainerElementAccess.ql b/cpp/cert/src/rules/CTR51-CPP/UsesValidContainerElementAccess.ql
index 4e8afd6e7..3a6c209f9 100644
--- a/cpp/cert/src/rules/CTR51-CPP/UsesValidContainerElementAccess.ql
+++ b/cpp/cert/src/rules/CTR51-CPP/UsesValidContainerElementAccess.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql b/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql
index f119e8964..ae4e1a20b 100644
--- a/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql
+++ b/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR53-CPP/UseValidIteratorRanges.ql b/cpp/cert/src/rules/CTR53-CPP/UseValidIteratorRanges.ql
index cd6a9444b..e133d7b3e 100644
--- a/cpp/cert/src/rules/CTR53-CPP/UseValidIteratorRanges.ql
+++ b/cpp/cert/src/rules/CTR53-CPP/UseValidIteratorRanges.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR54-CPP/DoNotSubtractIteratorsForDifferentContainers.ql b/cpp/cert/src/rules/CTR54-CPP/DoNotSubtractIteratorsForDifferentContainers.ql
index 2b156b1c6..d7389dbc3 100644
--- a/cpp/cert/src/rules/CTR54-CPP/DoNotSubtractIteratorsForDifferentContainers.ql
+++ b/cpp/cert/src/rules/CTR54-CPP/DoNotSubtractIteratorsForDifferentContainers.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p8
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.ql b/cpp/cert/src/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.ql
index 74f235e88..a762641d5 100644
--- a/cpp/cert/src/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.ql
+++ b/cpp/cert/src/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql b/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql
index e8db5e698..629a979d8 100644
--- a/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql
+++ b/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p9
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL50-CPP/DoNotDefineACStyleVariadicFunction.ql b/cpp/cert/src/rules/DCL50-CPP/DoNotDefineACStyleVariadicFunction.ql
index b1e5e4d02..3b6594e11 100644
--- a/cpp/cert/src/rules/DCL50-CPP/DoNotDefineACStyleVariadicFunction.ql
+++ b/cpp/cert/src/rules/DCL50-CPP/DoNotDefineACStyleVariadicFunction.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p12
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql b/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql
index 730a8f9f7..470272900 100644
--- a/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql
+++ b/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql
@@ -14,9 +14,9 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql b/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql
index c575644bb..8e88ccf14 100644
--- a/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql
+++ b/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL54-CPP/SingularOverloadOfMemoryFunction.ql b/cpp/cert/src/rules/DCL54-CPP/SingularOverloadOfMemoryFunction.ql
index dcb0bd844..5968ea364 100644
--- a/cpp/cert/src/rules/DCL54-CPP/SingularOverloadOfMemoryFunction.ql
+++ b/cpp/cert/src/rules/DCL54-CPP/SingularOverloadOfMemoryFunction.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL56-CPP/CyclesDuringStaticObjectInit.ql b/cpp/cert/src/rules/DCL56-CPP/CyclesDuringStaticObjectInit.ql
index f55a8aa40..53e939611 100644
--- a/cpp/cert/src/rules/DCL56-CPP/CyclesDuringStaticObjectInit.ql
+++ b/cpp/cert/src/rules/DCL56-CPP/CyclesDuringStaticObjectInit.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL57-CPP/DoNotLetExceptionsEscapeFromDestructorsOrDeallocationFunctions.ql b/cpp/cert/src/rules/DCL57-CPP/DoNotLetExceptionsEscapeFromDestructorsOrDeallocationFunctions.ql
index fbe7c343d..989a90a5d 100644
--- a/cpp/cert/src/rules/DCL57-CPP/DoNotLetExceptionsEscapeFromDestructorsOrDeallocationFunctions.ql
+++ b/cpp/cert/src/rules/DCL57-CPP/DoNotLetExceptionsEscapeFromDestructorsOrDeallocationFunctions.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL58-CPP/ModificationOfTheStandardNamespaces.ql b/cpp/cert/src/rules/DCL58-CPP/ModificationOfTheStandardNamespaces.ql
index 7d7a9e385..1458426cd 100644
--- a/cpp/cert/src/rules/DCL58-CPP/ModificationOfTheStandardNamespaces.ql
+++ b/cpp/cert/src/rules/DCL58-CPP/ModificationOfTheStandardNamespaces.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/DCL59-CPP/UnnamedNamespaceInHeaderFile.ql b/cpp/cert/src/rules/DCL59-CPP/UnnamedNamespaceInHeaderFile.ql
index a84c93cb3..74cdedb78 100644
--- a/cpp/cert/src/rules/DCL59-CPP/UnnamedNamespaceInHeaderFile.ql
+++ b/cpp/cert/src/rules/DCL59-CPP/UnnamedNamespaceInHeaderFile.ql
@@ -15,8 +15,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR50-CPP/ExitHandlerThrowsExceptionCert.ql b/cpp/cert/src/rules/ERR50-CPP/ExitHandlerThrowsExceptionCert.ql
index c4e5ff63e..65f59e3a3 100644
--- a/cpp/cert/src/rules/ERR50-CPP/ExitHandlerThrowsExceptionCert.ql
+++ b/cpp/cert/src/rules/ERR50-CPP/ExitHandlerThrowsExceptionCert.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR50-CPP/ExplicitAbruptTerminationCert.ql b/cpp/cert/src/rules/ERR50-CPP/ExplicitAbruptTerminationCert.ql
index 1c723fd7a..2053b3a94 100644
--- a/cpp/cert/src/rules/ERR50-CPP/ExplicitAbruptTerminationCert.ql
+++ b/cpp/cert/src/rules/ERR50-CPP/ExplicitAbruptTerminationCert.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR50-CPP/RethrowNestedWithoutCaptureCert.ql b/cpp/cert/src/rules/ERR50-CPP/RethrowNestedWithoutCaptureCert.ql
index ebef7de1c..3a5e4c5f2 100644
--- a/cpp/cert/src/rules/ERR50-CPP/RethrowNestedWithoutCaptureCert.ql
+++ b/cpp/cert/src/rules/ERR50-CPP/RethrowNestedWithoutCaptureCert.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR51-CPP/HandleAllExceptions.ql b/cpp/cert/src/rules/ERR51-CPP/HandleAllExceptions.ql
index b822cfdce..27bb232af 100644
--- a/cpp/cert/src/rules/ERR51-CPP/HandleAllExceptions.ql
+++ b/cpp/cert/src/rules/ERR51-CPP/HandleAllExceptions.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql b/cpp/cert/src/rules/ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql
index 3e4430a17..78566ac0f 100644
--- a/cpp/cert/src/rules/ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql
+++ b/cpp/cert/src/rules/ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql
@@ -13,9 +13,9 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR53-CPP/DestroyedValueReferencedInConstructorDestructorCatchBlock.ql b/cpp/cert/src/rules/ERR53-CPP/DestroyedValueReferencedInConstructorDestructorCatchBlock.ql
index b80f9b17f..42581caf7 100644
--- a/cpp/cert/src/rules/ERR53-CPP/DestroyedValueReferencedInConstructorDestructorCatchBlock.ql
+++ b/cpp/cert/src/rules/ERR53-CPP/DestroyedValueReferencedInConstructorDestructorCatchBlock.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR54-CPP/CatchBlockShadowingCert.ql b/cpp/cert/src/rules/ERR54-CPP/CatchBlockShadowingCert.ql
index 143c3b9a6..3fc9d142f 100644
--- a/cpp/cert/src/rules/ERR54-CPP/CatchBlockShadowingCert.ql
+++ b/cpp/cert/src/rules/ERR54-CPP/CatchBlockShadowingCert.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR56-CPP/GuaranteeExceptionSafety.ql b/cpp/cert/src/rules/ERR56-CPP/GuaranteeExceptionSafety.ql
index 13208d694..19c6d78ff 100644
--- a/cpp/cert/src/rules/ERR56-CPP/GuaranteeExceptionSafety.ql
+++ b/cpp/cert/src/rules/ERR56-CPP/GuaranteeExceptionSafety.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p9
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR57-CPP/DoNotLeakResourcesWhenHandlingExceptions.ql b/cpp/cert/src/rules/ERR57-CPP/DoNotLeakResourcesWhenHandlingExceptions.ql
index 6cd55e3a8..b3855ca9b 100644
--- a/cpp/cert/src/rules/ERR57-CPP/DoNotLeakResourcesWhenHandlingExceptions.ql
+++ b/cpp/cert/src/rules/ERR57-CPP/DoNotLeakResourcesWhenHandlingExceptions.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR60-CPP/ExceptionObjectsMustBeNothrowCopyConstructible.ql b/cpp/cert/src/rules/ERR60-CPP/ExceptionObjectsMustBeNothrowCopyConstructible.ql
index 3ab5918dc..5b425033d 100644
--- a/cpp/cert/src/rules/ERR60-CPP/ExceptionObjectsMustBeNothrowCopyConstructible.ql
+++ b/cpp/cert/src/rules/ERR60-CPP/ExceptionObjectsMustBeNothrowCopyConstructible.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR61-CPP/CatchExceptionsByLvalueReference.ql b/cpp/cert/src/rules/ERR61-CPP/CatchExceptionsByLvalueReference.ql
index dcff5dc25..4612b7e3c 100644
--- a/cpp/cert/src/rules/ERR61-CPP/CatchExceptionsByLvalueReference.ql
+++ b/cpp/cert/src/rules/ERR61-CPP/CatchExceptionsByLvalueReference.ql
@@ -13,9 +13,9 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p3
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/ERR62-CPP/DetectErrorsWhenConvertingAStringToANumber.ql b/cpp/cert/src/rules/ERR62-CPP/DetectErrorsWhenConvertingAStringToANumber.ql
index fdd2e9848..51f2451e2 100644
--- a/cpp/cert/src/rules/ERR62-CPP/DetectErrorsWhenConvertingAStringToANumber.ql
+++ b/cpp/cert/src/rules/ERR62-CPP/DetectErrorsWhenConvertingAStringToANumber.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql b/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql
index 417a384ce..4cbcfd10f 100644
--- a/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql
+++ b/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP53-CPP/DoNotReadUninitializedMemory.ql b/cpp/cert/src/rules/EXP53-CPP/DoNotReadUninitializedMemory.ql
index 7dfd2b6e7..105ff752d 100644
--- a/cpp/cert/src/rules/EXP53-CPP/DoNotReadUninitializedMemory.ql
+++ b/cpp/cert/src/rules/EXP53-CPP/DoNotReadUninitializedMemory.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p12
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedAfterLifetimeCert.ql b/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedAfterLifetimeCert.ql
index 9c71c89ad..a3b698478 100644
--- a/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedAfterLifetimeCert.ql
+++ b/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedAfterLifetimeCert.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedBeforeLifetimeCert.ql b/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedBeforeLifetimeCert.ql
index ebea7372b..ed7818644 100644
--- a/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedBeforeLifetimeCert.ql
+++ b/cpp/cert/src/rules/EXP54-CPP/ObjectAccessedBeforeLifetimeCert.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP57-CPP/DeletingPointerToIncompleteClass.ql b/cpp/cert/src/rules/EXP57-CPP/DeletingPointerToIncompleteClass.ql
index 9c89c42fd..6ab801772 100644
--- a/cpp/cert/src/rules/EXP57-CPP/DeletingPointerToIncompleteClass.ql
+++ b/cpp/cert/src/rules/EXP57-CPP/DeletingPointerToIncompleteClass.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP58-CPP/PassNonTrivialObjectToVaStart.ql b/cpp/cert/src/rules/EXP58-CPP/PassNonTrivialObjectToVaStart.ql
index d5ffa6c63..a975bb42a 100644
--- a/cpp/cert/src/rules/EXP58-CPP/PassNonTrivialObjectToVaStart.ql
+++ b/cpp/cert/src/rules/EXP58-CPP/PassNonTrivialObjectToVaStart.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP58-CPP/PassPromotablePrimitiveTypeToVaStart.ql b/cpp/cert/src/rules/EXP58-CPP/PassPromotablePrimitiveTypeToVaStart.ql
index 1f2662c8c..189252c43 100644
--- a/cpp/cert/src/rules/EXP58-CPP/PassPromotablePrimitiveTypeToVaStart.ql
+++ b/cpp/cert/src/rules/EXP58-CPP/PassPromotablePrimitiveTypeToVaStart.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP58-CPP/PassReferenceTypeToVaStart.ql b/cpp/cert/src/rules/EXP58-CPP/PassReferenceTypeToVaStart.ql
index c510ce074..25c552aea 100644
--- a/cpp/cert/src/rules/EXP58-CPP/PassReferenceTypeToVaStart.ql
+++ b/cpp/cert/src/rules/EXP58-CPP/PassReferenceTypeToVaStart.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP61-CPP/EscapingLambdaObjectWithCaptureByReference.ql b/cpp/cert/src/rules/EXP61-CPP/EscapingLambdaObjectWithCaptureByReference.ql
index b8e7b0de1..7edeed01e 100644
--- a/cpp/cert/src/rules/EXP61-CPP/EscapingLambdaObjectWithCaptureByReference.ql
+++ b/cpp/cert/src/rules/EXP61-CPP/EscapingLambdaObjectWithCaptureByReference.ql
@@ -15,8 +15,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP61-CPP/ReturningLambdaObjectWithCaptureByReference.ql b/cpp/cert/src/rules/EXP61-CPP/ReturningLambdaObjectWithCaptureByReference.ql
index 2bf272a73..263851237 100644
--- a/cpp/cert/src/rules/EXP61-CPP/ReturningLambdaObjectWithCaptureByReference.ql
+++ b/cpp/cert/src/rules/EXP61-CPP/ReturningLambdaObjectWithCaptureByReference.ql
@@ -15,8 +15,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP62-CPP/MemcmpUsedToAccessObjectRepresentation.ql b/cpp/cert/src/rules/EXP62-CPP/MemcmpUsedToAccessObjectRepresentation.ql
index 695eb7fd1..7bd9d4d9f 100644
--- a/cpp/cert/src/rules/EXP62-CPP/MemcmpUsedToAccessObjectRepresentation.ql
+++ b/cpp/cert/src/rules/EXP62-CPP/MemcmpUsedToAccessObjectRepresentation.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP62-CPP/MemcpyUsedToAccessObjectRepresentation.ql b/cpp/cert/src/rules/EXP62-CPP/MemcpyUsedToAccessObjectRepresentation.ql
index 307e0419c..9db7bcaa8 100644
--- a/cpp/cert/src/rules/EXP62-CPP/MemcpyUsedToAccessObjectRepresentation.ql
+++ b/cpp/cert/src/rules/EXP62-CPP/MemcpyUsedToAccessObjectRepresentation.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP62-CPP/MemsetUsedToAccessObjectRepresentation.ql b/cpp/cert/src/rules/EXP62-CPP/MemsetUsedToAccessObjectRepresentation.ql
index 20f25909a..92190600a 100644
--- a/cpp/cert/src/rules/EXP62-CPP/MemsetUsedToAccessObjectRepresentation.ql
+++ b/cpp/cert/src/rules/EXP62-CPP/MemsetUsedToAccessObjectRepresentation.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/EXP63-CPP/DoNotRelyOnTheValueOfAMovedFromObject.ql b/cpp/cert/src/rules/EXP63-CPP/DoNotRelyOnTheValueOfAMovedFromObject.ql
index 7c878528a..76818e34e 100644
--- a/cpp/cert/src/rules/EXP63-CPP/DoNotRelyOnTheValueOfAMovedFromObject.ql
+++ b/cpp/cert/src/rules/EXP63-CPP/DoNotRelyOnTheValueOfAMovedFromObject.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p8
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/FIO50-CPP/InterleavedInputOutputWithoutPosition.ql b/cpp/cert/src/rules/FIO50-CPP/InterleavedInputOutputWithoutPosition.ql
index e645a5630..df200bc3f 100644
--- a/cpp/cert/src/rules/FIO50-CPP/InterleavedInputOutputWithoutPosition.ql
+++ b/cpp/cert/src/rules/FIO50-CPP/InterleavedInputOutputWithoutPosition.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/FIO51-CPP/CloseFilesWhenTheyAreNoLongerNeeded.ql b/cpp/cert/src/rules/FIO51-CPP/CloseFilesWhenTheyAreNoLongerNeeded.ql
index 0634f376a..984f4fcf7 100644
--- a/cpp/cert/src/rules/FIO51-CPP/CloseFilesWhenTheyAreNoLongerNeeded.ql
+++ b/cpp/cert/src/rules/FIO51-CPP/CloseFilesWhenTheyAreNoLongerNeeded.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM50-CPP/UseAfterFree.ql b/cpp/cert/src/rules/MEM50-CPP/UseAfterFree.ql
index 1ff132e76..819297b4e 100644
--- a/cpp/cert/src/rules/MEM50-CPP/UseAfterFree.ql
+++ b/cpp/cert/src/rules/MEM50-CPP/UseAfterFree.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM51-CPP/ProperlyDeallocateDynamicallyAllocatedResources.ql b/cpp/cert/src/rules/MEM51-CPP/ProperlyDeallocateDynamicallyAllocatedResources.ql
index 356e3d0ff..0aa5e0431 100644
--- a/cpp/cert/src/rules/MEM51-CPP/ProperlyDeallocateDynamicallyAllocatedResources.ql
+++ b/cpp/cert/src/rules/MEM51-CPP/ProperlyDeallocateDynamicallyAllocatedResources.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql b/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql
index d4c1c188d..6cba2768e 100644
--- a/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql
+++ b/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql b/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql
index f0769fc60..2372108b9 100644
--- a/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql
+++ b/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM54-CPP/PlacementNewInsufficientStorageCert.ql b/cpp/cert/src/rules/MEM54-CPP/PlacementNewInsufficientStorageCert.ql
index 706d39179..07f44419f 100644
--- a/cpp/cert/src/rules/MEM54-CPP/PlacementNewInsufficientStorageCert.ql
+++ b/cpp/cert/src/rules/MEM54-CPP/PlacementNewInsufficientStorageCert.ql
@@ -15,8 +15,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM54-CPP/PlacementNewNotProperlyAlignedCert.ql b/cpp/cert/src/rules/MEM54-CPP/PlacementNewNotProperlyAlignedCert.ql
index 26ca448a7..51624659e 100644
--- a/cpp/cert/src/rules/MEM54-CPP/PlacementNewNotProperlyAlignedCert.ql
+++ b/cpp/cert/src/rules/MEM54-CPP/PlacementNewNotProperlyAlignedCert.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM55-CPP/OperatorDeleteMissingPartnerCert.ql b/cpp/cert/src/rules/MEM55-CPP/OperatorDeleteMissingPartnerCert.ql
index 076c2bd60..2744b6efc 100644
--- a/cpp/cert/src/rules/MEM55-CPP/OperatorDeleteMissingPartnerCert.ql
+++ b/cpp/cert/src/rules/MEM55-CPP/OperatorDeleteMissingPartnerCert.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM55-CPP/ThrowingNoThrowOperatorNewDeleteCert.ql b/cpp/cert/src/rules/MEM55-CPP/ThrowingNoThrowOperatorNewDeleteCert.ql
index ba8f100b4..033d08754 100644
--- a/cpp/cert/src/rules/MEM55-CPP/ThrowingNoThrowOperatorNewDeleteCert.ql
+++ b/cpp/cert/src/rules/MEM55-CPP/ThrowingNoThrowOperatorNewDeleteCert.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewReturnsNullCert.ql b/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewReturnsNullCert.ql
index 7f09dc7c8..475c77e98 100644
--- a/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewReturnsNullCert.ql
+++ b/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewReturnsNullCert.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewThrowsInvalidExceptionCert.ql b/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewThrowsInvalidExceptionCert.ql
index 401806277..2df872c42 100644
--- a/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewThrowsInvalidExceptionCert.ql
+++ b/cpp/cert/src/rules/MEM55-CPP/ThrowingOperatorNewThrowsInvalidExceptionCert.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MEM57-CPP/UsingDefaultOperatorNewForOverAlignedTypes.ql b/cpp/cert/src/rules/MEM57-CPP/UsingDefaultOperatorNewForOverAlignedTypes.ql
index 510f89842..ca0bee24a 100644
--- a/cpp/cert/src/rules/MEM57-CPP/UsingDefaultOperatorNewForOverAlignedTypes.ql
+++ b/cpp/cert/src/rules/MEM57-CPP/UsingDefaultOperatorNewForOverAlignedTypes.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MSC50-CPP/DoNotUseRandForGeneratingPseudorandomNumbers.ql b/cpp/cert/src/rules/MSC50-CPP/DoNotUseRandForGeneratingPseudorandomNumbers.ql
index eacf22812..5ed45121e 100644
--- a/cpp/cert/src/rules/MSC50-CPP/DoNotUseRandForGeneratingPseudorandomNumbers.ql
+++ b/cpp/cert/src/rules/MSC50-CPP/DoNotUseRandForGeneratingPseudorandomNumbers.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql b/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql
index ae8562e59..4a95000c7 100644
--- a/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql
+++ b/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MSC52-CPP/NonVoidFunctionDoesNotReturnCert.ql b/cpp/cert/src/rules/MSC52-CPP/NonVoidFunctionDoesNotReturnCert.ql
index ef850a17e..57f0c1d60 100644
--- a/cpp/cert/src/rules/MSC52-CPP/NonVoidFunctionDoesNotReturnCert.ql
+++ b/cpp/cert/src/rules/MSC52-CPP/NonVoidFunctionDoesNotReturnCert.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p8
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MSC53-CPP/FunctionNoReturnAttributeConditionCert.ql b/cpp/cert/src/rules/MSC53-CPP/FunctionNoReturnAttributeConditionCert.ql
index c4ddcc459..1e1bcba2f 100644
--- a/cpp/cert/src/rules/MSC53-CPP/FunctionNoReturnAttributeConditionCert.ql
+++ b/cpp/cert/src/rules/MSC53-CPP/FunctionNoReturnAttributeConditionCert.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/MSC54-CPP/SignalHandlerMustBeAPlainOldFunction.ql b/cpp/cert/src/rules/MSC54-CPP/SignalHandlerMustBeAPlainOldFunction.ql
index d5962ca61..ce1ac108c 100644
--- a/cpp/cert/src/rules/MSC54-CPP/SignalHandlerMustBeAPlainOldFunction.ql
+++ b/cpp/cert/src/rules/MSC54-CPP/SignalHandlerMustBeAPlainOldFunction.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP50-CPP/DoNotInvokeVirtualFunctionsFromConstructorsOrDestructors.ql b/cpp/cert/src/rules/OOP50-CPP/DoNotInvokeVirtualFunctionsFromConstructorsOrDestructors.ql
index cfa4b9c33..e2a4250e5 100644
--- a/cpp/cert/src/rules/OOP50-CPP/DoNotInvokeVirtualFunctionsFromConstructorsOrDestructors.ql
+++ b/cpp/cert/src/rules/OOP50-CPP/DoNotInvokeVirtualFunctionsFromConstructorsOrDestructors.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP51-CPP/DoNotSliceDerivedObjects.ql b/cpp/cert/src/rules/OOP51-CPP/DoNotSliceDerivedObjects.ql
index ace00e591..a5a547444 100644
--- a/cpp/cert/src/rules/OOP51-CPP/DoNotSliceDerivedObjects.ql
+++ b/cpp/cert/src/rules/OOP51-CPP/DoNotSliceDerivedObjects.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP52-CPP/DoNotDeleteAPolymorphicObjectWithoutAVirtualDestructor.ql b/cpp/cert/src/rules/OOP52-CPP/DoNotDeleteAPolymorphicObjectWithoutAVirtualDestructor.ql
index 92597beae..9a7c0604a 100644
--- a/cpp/cert/src/rules/OOP52-CPP/DoNotDeleteAPolymorphicObjectWithoutAVirtualDestructor.ql
+++ b/cpp/cert/src/rules/OOP52-CPP/DoNotDeleteAPolymorphicObjectWithoutAVirtualDestructor.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p9
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP53-CPP/UseCanonicalOrderForMemberInit.ql b/cpp/cert/src/rules/OOP53-CPP/UseCanonicalOrderForMemberInit.ql
index 57eaac45e..00164c2cf 100644
--- a/cpp/cert/src/rules/OOP53-CPP/UseCanonicalOrderForMemberInit.ql
+++ b/cpp/cert/src/rules/OOP53-CPP/UseCanonicalOrderForMemberInit.ql
@@ -17,8 +17,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p4
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/style
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP54-CPP/GracefullyHandleSelfCopyAssignment.ql b/cpp/cert/src/rules/OOP54-CPP/GracefullyHandleSelfCopyAssignment.ql
index 051c397b0..4f8d3c3c2 100644
--- a/cpp/cert/src/rules/OOP54-CPP/GracefullyHandleSelfCopyAssignment.ql
+++ b/cpp/cert/src/rules/OOP54-CPP/GracefullyHandleSelfCopyAssignment.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP55-CPP/MemberAccessWithUninitializedStaticPointerToMember.ql b/cpp/cert/src/rules/OOP55-CPP/MemberAccessWithUninitializedStaticPointerToMember.ql
index 99c7276ba..90e7cccce 100644
--- a/cpp/cert/src/rules/OOP55-CPP/MemberAccessWithUninitializedStaticPointerToMember.ql
+++ b/cpp/cert/src/rules/OOP55-CPP/MemberAccessWithUninitializedStaticPointerToMember.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessNonexistentMember.ql b/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessNonexistentMember.ql
index c9951e5fb..13391c086 100644
--- a/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessNonexistentMember.ql
+++ b/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessNonexistentMember.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessUndefinedMember.ql b/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessUndefinedMember.ql
index 049dcf7c1..894b51a41 100644
--- a/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessUndefinedMember.ql
+++ b/cpp/cert/src/rules/OOP55-CPP/UseOfPointerToMemberToAccessUndefinedMember.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP56-CPP/HonorNewReplacementHandlerRequirements.ql b/cpp/cert/src/rules/OOP56-CPP/HonorNewReplacementHandlerRequirements.ql
index 5f436baf5..32cbc72ac 100644
--- a/cpp/cert/src/rules/OOP56-CPP/HonorNewReplacementHandlerRequirements.ql
+++ b/cpp/cert/src/rules/OOP56-CPP/HonorNewReplacementHandlerRequirements.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP56-CPP/HonorTerminationReplacementHandlerRequirements.ql b/cpp/cert/src/rules/OOP56-CPP/HonorTerminationReplacementHandlerRequirements.ql
index c1f83a11a..a05289c3d 100644
--- a/cpp/cert/src/rules/OOP56-CPP/HonorTerminationReplacementHandlerRequirements.ql
+++ b/cpp/cert/src/rules/OOP56-CPP/HonorTerminationReplacementHandlerRequirements.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p2
  *       external/cert/level/l3
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP57-CPP/PreferSpecialMemberFunctionsAndOverloadedOperatorsToCStandardLibraryFunctions.ql b/cpp/cert/src/rules/OOP57-CPP/PreferSpecialMemberFunctionsAndOverloadedOperatorsToCStandardLibraryFunctions.ql
index edaeef9b1..f8b0f995d 100644
--- a/cpp/cert/src/rules/OOP57-CPP/PreferSpecialMemberFunctionsAndOverloadedOperatorsToCStandardLibraryFunctions.ql
+++ b/cpp/cert/src/rules/OOP57-CPP/PreferSpecialMemberFunctionsAndOverloadedOperatorsToCStandardLibraryFunctions.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/OOP58-CPP/CopyOperationsMustNotMutateTheSourceObject.ql b/cpp/cert/src/rules/OOP58-CPP/CopyOperationsMustNotMutateTheSourceObject.ql
index 454ede157..2e1ee9afa 100644
--- a/cpp/cert/src/rules/OOP58-CPP/CopyOperationsMustNotMutateTheSourceObject.ql
+++ b/cpp/cert/src/rules/OOP58-CPP/CopyOperationsMustNotMutateTheSourceObject.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/low
  *       external/cert/priority/p9
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/STR50-CPP/BasicStringMayNotBeNullTerminatedCert.ql b/cpp/cert/src/rules/STR50-CPP/BasicStringMayNotBeNullTerminatedCert.ql
index 41de6d7ae..51d780d48 100644
--- a/cpp/cert/src/rules/STR50-CPP/BasicStringMayNotBeNullTerminatedCert.ql
+++ b/cpp/cert/src/rules/STR50-CPP/BasicStringMayNotBeNullTerminatedCert.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/STR50-CPP/OperationMayNotNullTerminateCStyleStringCert.ql b/cpp/cert/src/rules/STR50-CPP/OperationMayNotNullTerminateCStyleStringCert.ql
index 9c2b4e4c0..36adb91a3 100644
--- a/cpp/cert/src/rules/STR50-CPP/OperationMayNotNullTerminateCStyleStringCert.ql
+++ b/cpp/cert/src/rules/STR50-CPP/OperationMayNotNullTerminateCStyleStringCert.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/STR51-CPP/DoNotAttemptToCreateAStringFromANullPointer.ql b/cpp/cert/src/rules/STR51-CPP/DoNotAttemptToCreateAStringFromANullPointer.ql
index 984298779..6a8564860 100644
--- a/cpp/cert/src/rules/STR51-CPP/DoNotAttemptToCreateAStringFromANullPointer.ql
+++ b/cpp/cert/src/rules/STR51-CPP/DoNotAttemptToCreateAStringFromANullPointer.ql
@@ -12,8 +12,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p18
  *       external/cert/level/l1
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/STR52-CPP/UseValidReferencesForElementsOfString.ql b/cpp/cert/src/rules/STR52-CPP/UseValidReferencesForElementsOfString.ql
index 6805fd956..f5f747350 100644
--- a/cpp/cert/src/rules/STR52-CPP/UseValidReferencesForElementsOfString.ql
+++ b/cpp/cert/src/rules/STR52-CPP/UseValidReferencesForElementsOfString.ql
@@ -13,8 +13,8 @@
  *       external/cert/remediation-cost/high
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/cpp/cert/src/rules/STR53-CPP/RangeCheckStringElementAccess.ql b/cpp/cert/src/rules/STR53-CPP/RangeCheckStringElementAccess.ql
index 964adba12..cb11bd6c7 100644
--- a/cpp/cert/src/rules/STR53-CPP/RangeCheckStringElementAccess.ql
+++ b/cpp/cert/src/rules/STR53-CPP/RangeCheckStringElementAccess.ql
@@ -14,8 +14,8 @@
  *       external/cert/remediation-cost/medium
  *       external/cert/priority/p6
  *       external/cert/level/l2
- *       external/cert/obligation/rule
  *       coding-standards/baseline/safety
+ *       external/cert/obligation/rule
  */
 
 import cpp
diff --git a/rule_packages/c/Alignment.json b/rule_packages/c/Alignment.json
index add1b9d36..839503c16 100644
--- a/rule_packages/c/Alignment.json
+++ b/rule_packages/c/Alignment.json
@@ -31,8 +31,7 @@
             "external/misra/c/2012/amendment3",
             "readability",
             "maintainability",
-            "coding-standards/baseline/safety",
-            "coding-standards/baseline/style"
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Banned.json b/rule_packages/c/Banned.json
index 2088ce704..5bbe97369 100644
--- a/rule_packages/c/Banned.json
+++ b/rule_packages/c/Banned.json
@@ -389,8 +389,7 @@
             "correctness",
             "security",
             "external/misra/c/2012/third-edition-first-revision",
-            "coding-standards/baseline/safety",
-            "coding-standards/baseline/style"
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Concurrency8.json b/rule_packages/c/Concurrency8.json
index 64a0d0f39..fe1cd92c9 100644
--- a/rule_packages/c/Concurrency8.json
+++ b/rule_packages/c/Concurrency8.json
@@ -15,8 +15,7 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4",
-            "coding-standards/baseline/safety"
+            "external/misra/c/2012/amendment4"
           ]
         }
       ],
@@ -37,8 +36,7 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4",
-            "coding-standards/baseline/safety"
+            "external/misra/c/2012/amendment4"
           ]
         }
       ],
@@ -59,8 +57,7 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4",
-            "coding-standards/baseline/safety"
+            "external/misra/c/2012/amendment4"
           ]
         },
         {
@@ -74,8 +71,7 @@
             "readability",
             "maintainability",
             "concurrency",
-            "external/misra/c/2012/amendment4",
-            "coding-standards/baseline/safety"
+            "external/misra/c/2012/amendment4"
           ]
         },
         {
diff --git a/rule_packages/c/Concurrency9.json b/rule_packages/c/Concurrency9.json
index 3967acb85..b5e68c475 100644
--- a/rule_packages/c/Concurrency9.json
+++ b/rule_packages/c/Concurrency9.json
@@ -36,8 +36,7 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4",
-            "coding-standards/baseline/safety"
+            "external/misra/c/2012/amendment4"
           ]
         }
       ],
@@ -80,8 +79,7 @@
           "tags": [
             "correctness",
             "concurrency",
-            "external/misra/c/2012/amendment4",
-            "coding-standards/baseline/safety"
+            "external/misra/c/2012/amendment4"
           ]
         },
         {
@@ -95,8 +93,7 @@
             "correctness",
             "concurrency",
             "external/misra/c/2012/amendment4",
-            "external/misra/audit",
-            "coding-standards/baseline/safety"
+            "external/misra/audit"
           ]
         }
       ],
@@ -154,8 +151,7 @@
             "readability",
             "maintainability",
             "concurrency",
-            "external/misra/c/2012/amendment4",
-            "coding-standards/baseline/safety"
+            "external/misra/c/2012/amendment4"
           ]
         }
       ],
diff --git a/rule_packages/c/Contracts4.json b/rule_packages/c/Contracts4.json
index 6554ab816..927c6ba77 100644
--- a/rule_packages/c/Contracts4.json
+++ b/rule_packages/c/Contracts4.json
@@ -52,8 +52,7 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2",
-            "coding-standards/baseline/safety"
+            "external/cert/level/l2"
           ]
         },
         {
@@ -69,8 +68,7 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2",
-            "coding-standards/baseline/safety"
+            "external/cert/level/l2"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations1.json b/rule_packages/c/Declarations1.json
index dc10485cb..13c3cbd1a 100644
--- a/rule_packages/c/Declarations1.json
+++ b/rule_packages/c/Declarations1.json
@@ -103,7 +103,8 @@
             "correctness",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query considers the first 31 characters of identifiers as significant, as per C99 and reports the case when names are longer than 31 characters and differ in those characters past the 31 first only. This query does not consider universal or extended source characters.",
@@ -129,9 +130,7 @@
             "correctness",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision",
-            "coding-standards/baseline/safety",
-            "coding-standards/baseline/style"
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query checks the first 63 characters of macro identifiers as significant, as per C99. Distinctness of parameters within the same function like macro are checked by compiler and therefore not checked by this rule.",
diff --git a/rule_packages/c/Declarations6.json b/rule_packages/c/Declarations6.json
index b6802c7a2..b9691b861 100644
--- a/rule_packages/c/Declarations6.json
+++ b/rule_packages/c/Declarations6.json
@@ -126,8 +126,7 @@
           "tags": [
             "correctness",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision",
-            "coding-standards/baseline/style"
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations7.json b/rule_packages/c/Declarations7.json
index 3633b7552..08a8c17af 100644
--- a/rule_packages/c/Declarations7.json
+++ b/rule_packages/c/Declarations7.json
@@ -70,8 +70,7 @@
             "correctness",
             "readability",
             "external/misra/c/2012/third-edition-first-revision",
-            "coding-standards/baseline/safety",
-            "coding-standards/baseline/style"
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations8.json b/rule_packages/c/Declarations8.json
index a59a21585..a7c925307 100644
--- a/rule_packages/c/Declarations8.json
+++ b/rule_packages/c/Declarations8.json
@@ -19,8 +19,7 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2",
-            "coding-standards/baseline/safety"
+            "external/cert/level/l2"
           ],
           "implementation_scope": {
             "description": "The rule checks specifically for pointers to objects with automatic storage duration that are assigned to static storage duration variables."
diff --git a/rule_packages/c/Expressions.json b/rule_packages/c/Expressions.json
index c961052e0..80a61bad3 100644
--- a/rule_packages/c/Expressions.json
+++ b/rule_packages/c/Expressions.json
@@ -56,8 +56,7 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p4",
-            "external/cert/level/l3",
-            "coding-standards/baseline/safety"
+            "external/cert/level/l3"
           ],
           "implementation_scope": {
             "description": "The analysis of invalid parameter count passed to POSIX open calls only applies when the value of the flags argument is computed locally."
diff --git a/rule_packages/c/Generics.json b/rule_packages/c/Generics.json
index 7ae337bd2..16e466853 100644
--- a/rule_packages/c/Generics.json
+++ b/rule_packages/c/Generics.json
@@ -15,7 +15,6 @@
           "tags": [
             "maintainability",
             "external/misra/c/2012/amendment3",
-            "coding-standards/baseline/safety",
             "coding-standards/baseline/style"
           ]
         },
@@ -30,7 +29,6 @@
             "correctness",
             "maintainability",
             "external/misra/c/2012/amendment3",
-            "coding-standards/baseline/safety",
             "coding-standards/baseline/style"
           ]
         }
@@ -51,7 +49,8 @@
           "short_name": "GenericSelectionNotFromMacroWithSideEffects",
           "tags": [
             "maintainability",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/IO4.json b/rule_packages/c/IO4.json
index fca7fe37f..c4372c5bc 100644
--- a/rule_packages/c/IO4.json
+++ b/rule_packages/c/IO4.json
@@ -66,8 +66,7 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2",
-            "coding-standards/baseline/safety"
+            "external/cert/level/l2"
           ]
         },
         {
@@ -84,8 +83,7 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p6",
-            "external/cert/level/l2",
-            "coding-standards/baseline/safety"
+            "external/cert/level/l2"
           ]
         }
       ],
diff --git a/rule_packages/c/Language4.json b/rule_packages/c/Language4.json
index 30727489b..e5f6bc73c 100644
--- a/rule_packages/c/Language4.json
+++ b/rule_packages/c/Language4.json
@@ -16,7 +16,6 @@
           "tags": [
             "readability",
             "external/misra/c/2012/amendment3",
-            "coding-standards/baseline/safety",
             "coding-standards/baseline/style"
           ]
         },
@@ -31,7 +30,6 @@
           "tags": [
             "readability",
             "external/misra/c/2012/amendment3",
-            "coding-standards/baseline/safety",
             "coding-standards/baseline/style"
           ]
         },
@@ -46,7 +44,6 @@
           "tags": [
             "correctness",
             "external/misra/c/2012/amendment3",
-            "coding-standards/baseline/safety",
             "coding-standards/baseline/style"
           ],
           "implementation_scope": {
@@ -64,7 +61,6 @@
             "maintainability",
             "readability",
             "external/misra/c/2012/amendment3",
-            "coding-standards/baseline/safety",
             "coding-standards/baseline/style"
           ]
         },
@@ -79,8 +75,7 @@
             "maintainability",
             "readability",
             "external/misra/c/2012/amendment3",
-            "coding-standards/baseline/safety",
-            "coding-standards/baseline/style"
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -94,8 +89,7 @@
             "external/misra/c/2012/amendment3",
             "security",
             "maintainability",
-            "coding-standards/baseline/safety",
-            "coding-standards/baseline/style"
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -108,9 +102,7 @@
           "tags": [
             "external/misra/c/2012/amendment3",
             "security",
-            "maintainability",
-            "coding-standards/baseline/safety",
-            "coding-standards/baseline/style"
+            "maintainability"
           ]
         },
         {
@@ -122,9 +114,7 @@
           "short_name": "SizeInReallocCallMayBeZero",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3",
-            "coding-standards/baseline/safety",
-            "coding-standards/baseline/style"
+            "external/misra/c/2012/amendment3"
           ]
         },
         {
@@ -137,8 +127,7 @@
           "tags": [
             "correctness",
             "external/misra/c/2012/amendment3",
-            "coding-standards/baseline/safety",
-            "coding-standards/baseline/style"
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Memory2.json b/rule_packages/c/Memory2.json
index d7014c7c1..c60c2b378 100644
--- a/rule_packages/c/Memory2.json
+++ b/rule_packages/c/Memory2.json
@@ -19,8 +19,7 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p8",
-            "external/cert/level/l2",
-            "coding-standards/baseline/safety"
+            "external/cert/level/l2"
           ]
         },
         {
diff --git a/rule_packages/c/Pointers1.json b/rule_packages/c/Pointers1.json
index 3dd31d1b5..c60d2812a 100644
--- a/rule_packages/c/Pointers1.json
+++ b/rule_packages/c/Pointers1.json
@@ -367,8 +367,7 @@
             "correctness",
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision",
-            "coding-standards/baseline/style"
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "To exclude compliant exceptions, this rule only excludes direct assignments of pointers to non-const-qualified types in the context of a single function and does not cover memory-copying functions. This rule also excludes pointers passed to other functions without conversion."
diff --git a/rule_packages/c/Preprocessor1.json b/rule_packages/c/Preprocessor1.json
index f402fa2bf..461cee4d1 100644
--- a/rule_packages/c/Preprocessor1.json
+++ b/rule_packages/c/Preprocessor1.json
@@ -37,8 +37,7 @@
           "shared_implementation_short_name": "HashOperatorsUsed",
           "tags": [
             "correctness",
-            "external/misra/c/2012/third-edition-first-revision",
-            "coding-standards/baseline/style"
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Preprocessor2.json b/rule_packages/c/Preprocessor2.json
index 98c0ac025..024837602 100644
--- a/rule_packages/c/Preprocessor2.json
+++ b/rule_packages/c/Preprocessor2.json
@@ -16,8 +16,7 @@
           "tags": [
             "correctness",
             "external/misra/c/2012/third-edition-first-revision",
-            "coding-standards/baseline/safety",
-            "coding-standards/baseline/style"
+            "coding-standards/baseline/safety"
           ],
           "implementation_scope": {
             "description": "This query applies to function like macros and not object like macros. This rule strictly disallows the use of # operator followed by a ## and other combinations are permitted.",
@@ -43,8 +42,7 @@
           "tags": [
             "maintainability",
             "readability",
-            "external/misra/c/2012/third-edition-first-revision",
-            "coding-standards/baseline/style"
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/SideEffects3.json b/rule_packages/c/SideEffects3.json
index 9ff78255f..7b6b5d3f5 100644
--- a/rule_packages/c/SideEffects3.json
+++ b/rule_packages/c/SideEffects3.json
@@ -27,7 +27,8 @@
           "short_name": "UnsequencedAtomicReads",
           "tags": [
             "correctness",
-            "external/misra/c/2012/amendment3"
+            "external/misra/c/2012/amendment3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/c/Syntax.json b/rule_packages/c/Syntax.json
index 2b68aee0d..c3ebf8cd5 100644
--- a/rule_packages/c/Syntax.json
+++ b/rule_packages/c/Syntax.json
@@ -109,7 +109,8 @@
           "tags": [
             "readability",
             "maintainability",
-            "external/misra/c/2012/third-edition-first-revision"
+            "external/misra/c/2012/third-edition-first-revision",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Allocations.json b/rule_packages/cpp/Allocations.json
index d2c1709ba..39a12f2c7 100644
--- a/rule_packages/cpp/Allocations.json
+++ b/rule_packages/cpp/Allocations.json
@@ -179,8 +179,7 @@
           "short_name": "OperatorDeleteMissingPartnerAutosar",
           "shared_implementation_short_name": "OperatorDeleteMissingPartner",
           "tags": [
-            "correctness",
-            "coding-standards/baseline/safety"
+            "correctness"
           ]
         }
       ],
@@ -257,8 +256,7 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1",
-            "coding-standards/baseline/safety"
+            "external/cert/level/l1"
           ]
         },
         {
@@ -346,7 +344,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -363,7 +362,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -380,7 +380,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -397,7 +398,8 @@
             "external/cert/likelihood/likely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p18",
-            "external/cert/level/l1"
+            "external/cert/level/l1",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/BannedAPIs.json b/rule_packages/cpp/BannedAPIs.json
index 89d22581f..3bb456fdd 100644
--- a/rule_packages/cpp/BannedAPIs.json
+++ b/rule_packages/cpp/BannedAPIs.json
@@ -16,8 +16,7 @@
           "tags": [
             "scope/single-translation-unit",
             "maintainability",
-            "correctness",
-            "coding-standards/baseline/style"
+            "correctness"
           ]
         }
       ],
@@ -128,8 +127,7 @@
           "tags": [
             "scope/single-translation-unit",
             "correctness",
-            "maintainability",
-            "coding-standards/baseline/style"
+            "maintainability"
           ]
         }
       ],
diff --git a/rule_packages/cpp/BannedFunctions.json b/rule_packages/cpp/BannedFunctions.json
index b85f7fc66..d0f3b7b50 100644
--- a/rule_packages/cpp/BannedFunctions.json
+++ b/rule_packages/cpp/BannedFunctions.json
@@ -42,7 +42,8 @@
           "short_name": "BindUsed",
           "tags": [
             "correctness",
-            "scope/single-translation-unit"
+            "scope/single-translation-unit",
+            "coding-standards/baseline/style"
           ]
         }
       ],
@@ -67,8 +68,7 @@
           "shared_implementation_short_name": "DoNotUseRandForGeneratingPseudorandomNumbers",
           "tags": [
             "security",
-            "scope/single-translation-unit",
-            "coding-standards/baseline/style"
+            "scope/single-translation-unit"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Exceptions1.json b/rule_packages/cpp/Exceptions1.json
index 725fcedaf..7978b6e1d 100644
--- a/rule_packages/cpp/Exceptions1.json
+++ b/rule_packages/cpp/Exceptions1.json
@@ -518,8 +518,7 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3",
-            "coding-standards/baseline/safety"
+            "external/cert/level/l3"
           ]
         },
         {
@@ -535,8 +534,7 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3",
-            "coding-standards/baseline/safety"
+            "external/cert/level/l3"
           ]
         },
         {
diff --git a/rule_packages/cpp/Expressions.json b/rule_packages/cpp/Expressions.json
index 7ccfd8457..3f51eeb0d 100644
--- a/rule_packages/cpp/Expressions.json
+++ b/rule_packages/cpp/Expressions.json
@@ -347,7 +347,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         },
         {
@@ -363,7 +364,8 @@
             "external/cert/likelihood/unlikely",
             "external/cert/remediation-cost/medium",
             "external/cert/priority/p4",
-            "external/cert/level/l3"
+            "external/cert/level/l3",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
diff --git a/rule_packages/cpp/ImportMisra23.json b/rule_packages/cpp/ImportMisra23.json
index 7262cbcbe..243fc7cc2 100644
--- a/rule_packages/cpp/ImportMisra23.json
+++ b/rule_packages/cpp/ImportMisra23.json
@@ -38,8 +38,7 @@
           "shared_implementation_short_name": "OneDefinitionRuleViolation",
           "tags": [
             "correctness",
-            "scope/system",
-            "coding-standards/baseline/safety"
+            "scope/system"
           ]
         }
       ],
@@ -119,8 +118,7 @@
           "shared_implementation_short_name": "RemoveConstOrVolatileQualification",
           "tags": [
             "correctness",
-            "scope/single-translation-unit",
-            "coding-standards/baseline/style"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -143,8 +141,7 @@
           "tags": [
             "readability",
             "maintainability",
-            "scope/single-translation-unit",
-            "coding-standards/baseline/safety"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -301,8 +298,7 @@
           "tags": [
             "correctness",
             "readability",
-            "scope/single-translation-unit",
-            "coding-standards/baseline/safety"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -520,8 +516,7 @@
           "short_name": "CommaOperatorShouldNotBeUsed",
           "shared_implementation_short_name": "CommaOperatorUsed",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/style"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -706,8 +701,7 @@
           "short_name": "VirtualAndNonVirtualClassInTheHierarchy",
           "shared_implementation_short_name": "VirtualAndNonVirtualClassInTheHierarchy",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/safety"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -770,8 +764,7 @@
           "short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor",
           "shared_implementation_short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor",
           "tags": [
-            "scope/system",
-            "coding-standards/baseline/style"
+            "scope/system"
           ]
         }
       ],
@@ -792,8 +785,7 @@
           "short_name": "InitializeAllVirtualBaseClasses",
           "shared_implementation_short_name": "InitializeAllVirtualBaseClasses",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/style"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -814,8 +806,7 @@
           "short_name": "InitializerListConstructorIsTheOnlyConstructor",
           "shared_implementation_short_name": "InitializerListConstructorIsTheOnlyConstructor",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/style"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -836,8 +827,7 @@
           "short_name": "AddressOfOperatorOverloaded",
           "shared_implementation_short_name": "AddressOfOperatorOverloaded",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/style"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -921,8 +911,7 @@
           "short_name": "NoexceptFunctionShouldNotPropagateToTheCaller",
           "shared_implementation_short_name": "NoexceptFunctionShouldNotPropagateToTheCaller",
           "tags": [
-            "scope/system",
-            "coding-standards/baseline/style"
+            "scope/system"
           ]
         }
       ],
@@ -1213,8 +1202,7 @@
           "short_name": "BackslashCharacterMisuse",
           "shared_implementation_short_name": "BackslashCharacterMisuse",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/safety"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -1235,8 +1223,7 @@
           "short_name": "NonTerminatedEscapeSequences",
           "shared_implementation_short_name": "NonTerminatedEscapeSequences",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/safety"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -1257,8 +1244,7 @@
           "short_name": "OctalConstantsUsed",
           "shared_implementation_short_name": "UseOfNonZeroOctalLiteral",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/safety"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -1279,8 +1265,7 @@
           "short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed",
           "shared_implementation_short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/safety"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -1301,8 +1286,7 @@
           "short_name": "LowercaseLStartsInLiteralSuffix",
           "shared_implementation_short_name": "LowercaseLStartsInLiteralSuffix",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/safety"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -1597,8 +1581,7 @@
           "short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType",
           "shared_implementation_short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/style"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -1619,8 +1602,7 @@
           "short_name": "ReinterpretCastShallNotBeUsed",
           "shared_implementation_short_name": "ReinterpretCastUsed",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/style"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -1641,8 +1623,7 @@
           "short_name": "UnsignedOperationWithConstantOperandsWraps",
           "shared_implementation_short_name": "UnsignedOperationWithConstantOperandsWraps",
           "tags": [
-            "scope/single-translation-unit",
-            "coding-standards/baseline/style"
+            "scope/single-translation-unit"
           ]
         }
       ],
@@ -1686,8 +1667,7 @@
           "tags": [
             "maintainability",
             "readability",
-            "scope/single-translation-unit",
-            "coding-standards/baseline/safety"
+            "scope/single-translation-unit"
           ]
         },
         {
@@ -1701,8 +1681,7 @@
           "tags": [
             "maintainability",
             "readability",
-            "scope/single-translation-unit",
-            "coding-standards/baseline/safety"
+            "scope/single-translation-unit"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Inheritance.json b/rule_packages/cpp/Inheritance.json
index 823266407..c35008a7f 100644
--- a/rule_packages/cpp/Inheritance.json
+++ b/rule_packages/cpp/Inheritance.json
@@ -17,9 +17,7 @@
           "precision": "low",
           "severity": "recommendation",
           "short_name": "PublicInheritanceNotUsedForIsARelationship",
-          "tags": [
-            "coding-standards/baseline/style"
-          ]
+          "tags": []
         }
       ],
       "title": "Public inheritance shall be used to implement 'is-a' relationship."
@@ -62,7 +60,9 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "ClassDerivedFromMoreThanOneNonInterfaceBaseClass",
-          "tags": []
+          "tags": [
+            "coding-standards/baseline/style"
+          ]
         }
       ],
       "title": "Class shall not be derived from more than one base class which is not an interface class."
diff --git a/rule_packages/cpp/Lambdas.json b/rule_packages/cpp/Lambdas.json
index d488ce391..691f5dd95 100644
--- a/rule_packages/cpp/Lambdas.json
+++ b/rule_packages/cpp/Lambdas.json
@@ -214,7 +214,8 @@
             "external/cert/likelihood/probable",
             "external/cert/remediation-cost/high",
             "external/cert/priority/p6",
-            "external/cert/level/l2"
+            "external/cert/level/l2",
+            "coding-standards/baseline/safety"
           ]
         },
         {
diff --git a/rule_packages/cpp/Literals.json b/rule_packages/cpp/Literals.json
index 5dcb35cb3..7070827a6 100644
--- a/rule_packages/cpp/Literals.json
+++ b/rule_packages/cpp/Literals.json
@@ -138,7 +138,8 @@
           "short_name": "UseOfNonZeroOctalLiteral",
           "shared_implementation_short_name": "UseOfNonZeroOctalLiteral",
           "tags": [
-            "readability"
+            "readability",
+            "coding-standards/baseline/style"
           ]
         },
         {
diff --git a/rule_packages/cpp/Loops.json b/rule_packages/cpp/Loops.json
index 1dddf9fee..b40a06a3a 100644
--- a/rule_packages/cpp/Loops.json
+++ b/rule_packages/cpp/Loops.json
@@ -161,9 +161,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "LoopCounterModifiedWithinStatement",
-          "tags": [
-            "coding-standards/baseline/safety"
-          ]
+          "tags": []
         }
       ],
       "title": "The loop-counter shall not be modified within condition or statement."
@@ -184,9 +182,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "IrregularLoopCounterModification",
-          "tags": [
-            "coding-standards/baseline/safety"
-          ]
+          "tags": []
         }
       ],
       "title": "The loop-counter should be modified by one of: --, ++, -=n, or +=n, where n remains constant for the duration of the loop."
diff --git a/rule_packages/cpp/Macros.json b/rule_packages/cpp/Macros.json
index 5e244b0b3..fbf48fe78 100644
--- a/rule_packages/cpp/Macros.json
+++ b/rule_packages/cpp/Macros.json
@@ -121,8 +121,7 @@
                     "short_name": "IncludeDirectivesNotPrecededByDirectivesOrComments",
                     "shared_implementation_short_name": "PreprocessorIncludesPreceded",
                     "tags": [
-                        "readability",
-                        "coding-standards/baseline/safety"
+                        "readability"
                     ]
                 }
             ],
@@ -170,7 +169,8 @@
                     "shared_implementation_short_name": "PreprocessingDirectiveWithinMacroArgument",
                     "tags": [
                         "readability",
-                        "correctness"
+                        "correctness",
+                        "coding-standards/baseline/safety"
                     ]
                 }
             ],
diff --git a/rule_packages/cpp/Pointers.json b/rule_packages/cpp/Pointers.json
index 5840d8d18..7e0fb228b 100644
--- a/rule_packages/cpp/Pointers.json
+++ b/rule_packages/cpp/Pointers.json
@@ -91,7 +91,8 @@
           "short_name": "PointerToMemberVirtualFunctionWithNullPointerConstant",
           "shared_implementation_short_name": "PotentiallyVirtualPointerOnlyComparesToNullptr",
           "tags": [
-            "correctness"
+            "correctness",
+            "coding-standards/baseline/safety"
           ]
         }
       ],
@@ -115,8 +116,7 @@
           "short_name": "DeletingPointerToIncompleteType",
           "shared_implementation_short_name": "DeleteOfPointerToIncompleteClass",
           "tags": [
-            "correctness",
-            "coding-standards/baseline/safety"
+            "correctness"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Scope.json b/rule_packages/cpp/Scope.json
index f612072b9..13409802c 100644
--- a/rule_packages/cpp/Scope.json
+++ b/rule_packages/cpp/Scope.json
@@ -115,8 +115,7 @@
           "short_name": "OneDefinitionRuleViolation",
           "shared_implementation_short_name": "OneDefinitionRuleViolation",
           "tags": [
-            "correctness",
-            "coding-standards/baseline/style"
+            "correctness"
           ]
         }
       ],
@@ -188,7 +187,8 @@
           "shared_implementation_short_name": "MissingStaticSpecifierFunctionRedeclarationShared",
           "tags": [
             "readability",
-            "coding-standards/baseline/safety"
+            "coding-standards/baseline/safety",
+            "coding-standards/baseline/style"
           ]
         }
       ],
diff --git a/rule_packages/cpp/Toolchain.json b/rule_packages/cpp/Toolchain.json
index 8fdc0ff5f..8bc8bdaa7 100644
--- a/rule_packages/cpp/Toolchain.json
+++ b/rule_packages/cpp/Toolchain.json
@@ -65,8 +65,7 @@
           "severity": "warning",
           "short_name": "IncrementOperatorWithBoolOperandIsDeprecated",
           "tags": [
-            "maintainability",
-            "coding-standards/baseline/style"
+            "maintainability"
           ]
         },
         {
@@ -77,8 +76,7 @@
           "severity": "warning",
           "short_name": "RegisterKeywordIsDeprecated",
           "tags": [
-            "maintainability",
-            "coding-standards/baseline/style"
+            "maintainability"
           ]
         },
         {
@@ -89,8 +87,7 @@
           "severity": "warning",
           "short_name": "ImplicitCopyConstructorIsDeprecated",
           "tags": [
-            "maintainability",
-            "coding-standards/baseline/style"
+            "maintainability"
           ]
         },
         {
@@ -101,8 +98,7 @@
           "severity": "warning",
           "short_name": "ImplicitCopyAssignmentOperatorIsDeprecated",
           "tags": [
-            "maintainability",
-            "coding-standards/baseline/style"
+            "maintainability"
           ]
         },
         {
@@ -113,8 +109,7 @@
           "severity": "warning",
           "short_name": "DynamicExceptionsAreDeprecated",
           "tags": [
-            "maintainability",
-            "coding-standards/baseline/style"
+            "maintainability"
           ]
         },
         {
@@ -137,8 +132,7 @@
           "severity": "warning",
           "short_name": "StrstreamTypesAreDeprecated",
           "tags": [
-            "maintainability",
-            "coding-standards/baseline/style"
+            "maintainability"
           ]
         }
       ],

From b35ad171541539275bcfaeaf62fdb81a5c085a29 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Sat, 6 Dec 2025 17:03:27 -0800
Subject: [PATCH 08/10] Fix test breakages from deprecation warnings changing
 lines

---
 ...bleLengthArraySizeNotInValidRange.expected |  4 +--
 .../CleanUpThreadSpecificStorage.expected     | 12 ++++----
 ...ateStorageDurationsFunctionReturn.expected | 10 +++----
 .../ERR30-C/ErrnoReadBeforeReturn.expected    |  2 +-
 .../ERR30-C/SetlocaleMightSetErrno.expected   |  2 +-
 ...tRelyOnIndeterminateValuesOfErrno.expected |  8 ++---
 ...nctionPointerWithIncompatibleType.expected |  8 ++---
 .../DoNotModifyConstantObjects.expected       |  8 ++---
 ...ointerReferencesOverlappingObject.expected | 12 ++++----
 ...esetStringsOnFgetsOrFgetwsFailure.expected |  6 ++--
 ...RaceConditionsWhileAccessingFiles.expected |  2 +-
 ...odifyAlignmentOfMemoryWithRealloc.expected | 10 +++----
 ...ssInvalidDataToTheAsctimeFunction.expected |  8 ++---
 ...VaListThatHasAnIndeterminateValue.expected | 12 ++++----
 ...SafeFunctionsWithinSignalHandlers.expected |  6 ++--
 ...romAComputationalExceptionHandler.expected |  2 +-
 ...oNotAttemptToModifyStringLiterals.expected | 30 +++++++++----------
 ...fficientSpaceForTheNullTerminator.expected | 12 ++++----
 .../RULE-13-2/UnsequencedAtomicReads.expected |  6 ++--
 ...yFunctionArgumentNumberOfElements.expected | 12 ++++----
 ...sedToCompareNullTerminatedStrings.expected |  8 ++---
 .../MutexObjectsNotAlwaysUnlocked.expected    |  4 +--
 ...ForReadAndWriteOnDifferentStreams.expected |  2 +-
 .../AttemptToWriteToAReadOnlyStream.expected  | 12 ++++----
 ...omparedWithUnmodifiedReturnValues.expected | 16 +++++-----
 .../AssignmentOperatorReturnThis.expected     |  2 +-
 ...orErrorLeavesObjectInInvalidState.expected | 18 +++++------
 ...entOfAnArrayPassedToASmartPointer.expected | 14 ++++-----
 .../UnnecessaryUseOfDynamicStorage.expected   | 10 +++----
 ...ArgumentToForwardSubsequentlyUsed.expected |  6 ++--
 .../A7-5-1/InvalidFunctionReturnType.expected |  6 ++--
 ...ntationsOfFloatingPointValuesUsed.expected |  6 ++--
 ...berFunctionReturnsNonConstPointer.expected |  4 +--
 ...cCppLibraryFunctionsDoNotOverflow.expected | 18 +++++------
 .../CTR53-CPP/UseValidIteratorRanges.expected | 12 ++++----
 ...UseAnAdditiveOperatorOnAnIterator.expected | 14 ++++-----
 ...terArithmeticOnPolymorphicObjects.expected |  8 ++---
 ...ThroughAPointerOfTheIncorrectType.expected |  8 ++---
 ...ctAndHandleMemoryAllocationErrors.expected | 14 ++++-----
 .../BadlySeededRandomNumberGenerator.expected |  2 +-
 40 files changed, 178 insertions(+), 178 deletions(-)

diff --git a/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected b/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected
index 1617571bb..2d970ed24 100644
--- a/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected
+++ b/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected
@@ -1,5 +1,5 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (VariableLengthArraySizeNotInValidRange.ql:110,11-19)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (VariableLengthArraySizeNotInValidRange.ql:93,5-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (VariableLengthArraySizeNotInValidRange.ql:111,11-19)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (VariableLengthArraySizeNotInValidRange.ql:94,5-18)
 | test.c:14:8:14:8 | VLA declaration | Variable-length array dimension size may be in an invalid range. |
 | test.c:15:8:15:8 | VLA declaration | Variable-length array dimension size may be in an invalid range. |
 | test.c:16:8:16:8 | VLA declaration | Variable-length array dimension size may be in an invalid range. |
diff --git a/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected b/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected
index f3ea87136..44a786846 100644
--- a/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected
+++ b/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected
@@ -1,9 +1,9 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:25,46-54)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:26,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:35,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:45,35-43)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:53,36-44)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:55,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:26,46-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:27,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:36,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:46,35-43)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:54,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:56,36-44)
 | test.c:27:3:27:12 | call to tss_create | Resources used by thread specific storage may not be cleaned up. |
 | test.c:49:3:49:12 | call to tss_create | Resources used by thread specific storage may not be cleaned up. |
 | test.c:71:3:71:12 | call to tss_create | Resources used by thread specific storage may not be cleaned up. |
diff --git a/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected b/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected
index a4359d700..ab786cad1 100644
--- a/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected
+++ b/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected
@@ -1,7 +1,7 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:33,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:37,31-39)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:50,6-14)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:50,26-34)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:56,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:34,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:38,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:51,6-14)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:51,26-34)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:57,3-11)
 | test.c:3:10:3:10 | a | $@ with automatic storage may be accessible outside of its lifetime. | test.c:3:10:3:10 | a | a |
 | test.c:15:4:15:8 | param [inner post update] | $@ with automatic storage may be accessible outside of its lifetime. | test.c:15:12:15:13 | a2 | a2 |
diff --git a/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected b/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected
index 125f55118..e12954a11 100644
--- a/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected
+++ b/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected
@@ -1,4 +1,4 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ErrnoReadBeforeReturn.ql:46,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ErrnoReadBeforeReturn.ql:47,7-15)
 | test.c:69:7:69:11 | * ... | Do not read `errno` before checking the return value of function $@. | test.c:68:3:68:7 | call to ftell | call to ftell |
 | test.c:69:7:69:11 | call to __errno_location | Do not read `errno` before checking the return value of function $@. | test.c:68:3:68:7 | call to ftell | call to ftell |
 | test.c:70:5:70:10 | call to perror | Do not read `errno` before checking the return value of function $@. | test.c:68:3:68:7 | call to ftell | call to ftell |
diff --git a/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected b/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected
index 20a7ff60b..e35e2ea81 100644
--- a/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected
+++ b/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected
@@ -1,3 +1,3 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (SetlocaleMightSetErrno.ql:70,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (SetlocaleMightSetErrno.ql:71,7-15)
 | test.c:98:3:98:11 | call to setlocale | Do not read `errno` before checking the return value of a call to `setlocale`. |
 | test.c:104:7:104:15 | call to setlocale | The value of `errno` may be different than `0` when `setlocale` is called. The following `errno` check might be invalid. |
diff --git a/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected b/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected
index b79a17ca3..d38c8e2e5 100644
--- a/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected
+++ b/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected
@@ -1,7 +1,7 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:56,7-15)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:56,27-35)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:57,9-17)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:60,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:57,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:57,27-35)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:58,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:61,9-17)
 | test.c:12:5:12:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:10:21:10:26 | call to signal | call to signal |
 | test.c:30:5:30:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:26:21:26:26 | call to signal | call to signal |
 | test.c:49:5:49:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:45:21:45:26 | call to signal | call to signal |
diff --git a/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected b/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
index 8daaf8361..166d334e7 100644
--- a/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
+++ b/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
@@ -1,7 +1,7 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:45,54-62)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:46,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:50,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:55,43-51)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:46,54-62)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:47,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:51,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:56,43-51)
 edges
 | test.c:48:68:48:70 | fns [f1] | test.c:49:3:49:5 | fns [f1] | provenance |  |
 | test.c:49:3:49:5 | fns [f1] | test.c:49:8:49:9 | f1 | provenance |  |
diff --git a/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected b/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
index 2ac874e77..15a9bb04d 100644
--- a/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
+++ b/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
@@ -1,7 +1,7 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:40,30-38)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:41,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:47,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:52,19-27)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:41,30-38)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:42,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:48,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:53,19-27)
 edges
 | test.c:5:8:5:9 | & ... | test.c:6:4:6:5 | aa | provenance |  |
 | test.c:26:15:26:15 | a | test.c:27:4:27:4 | a | provenance |  |
diff --git a/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected b/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected
index 40009edc0..048869233 100644
--- a/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected
+++ b/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected
@@ -1,10 +1,10 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:47,57-65)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:48,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:52,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:58,3-11)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:61,58-66)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:77,64-72)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:48,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:49,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:53,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:59,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:62,58-66)
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:78,64-72)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:79,64-72)
 | test.c:18:22:18:23 | i2 | Assignment to restrict-qualified pointer $@ results in pointers aliasing $@. | test.c:18:17:18:18 | i3 | i3 | test.c:18:22:18:23 | i2 | the object pointed to by i2 |
 | test.c:19:8:19:9 | g2 | Assignment to restrict-qualified pointer $@ results in pointers aliasing $@. | test.c:5:15:5:16 | g1 | g1 | test.c:19:8:19:9 | g2 | the object pointed to by g2 |
 | test.c:20:8:20:9 | i2 | Assignment to restrict-qualified pointer $@ results in pointers aliasing $@. | test.c:16:17:16:18 | i1 | i1 | test.c:20:8:20:9 | i2 | the object pointed to by i2 |
diff --git a/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected b/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected
index 52cb85e5c..c6123141e 100644
--- a/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected
+++ b/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected
@@ -1,6 +1,6 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:48,11-19)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:48,31-39)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:49,13-21)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:49,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:49,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:50,13-21)
 | test.c:20:10:20:12 | buf | The buffer is not reset before being referenced following a failed $@. | test.c:15:7:15:11 | call to fgets | call to fgets |
 | test.c:57:10:57:12 | buf | The buffer is not reset before being referenced following a failed $@. | test.c:52:7:52:11 | call to fgets | call to fgets |
 | test.c:66:18:66:20 | buf | The buffer is not reset before being referenced following a failed $@. | test.c:61:7:61:11 | call to fgets | call to fgets |
diff --git a/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected b/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected
index a211aa400..38d3264f3 100644
--- a/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected
+++ b/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected
@@ -1,3 +1,3 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ToctouRaceConditionsWhileAccessingFiles.ql:32,35-43)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ToctouRaceConditionsWhileAccessingFiles.ql:33,35-43)
 | test.c:4:13:4:17 | call to fopen | This call is trying to prevent an existing file from being overwritten by $@. An attacker might be able to exploit the race window between the two calls. | test.c:11:9:11:13 | call to fopen | another call |
 | test.c:88:13:88:17 | call to fopen | This call is trying to prevent an existing file from being overwritten by $@. An attacker might be able to exploit the race window between the two calls. | test.c:95:9:95:13 | call to fopen | another call |
diff --git a/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected b/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
index 587ae786d..599fb1c1a 100644
--- a/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
+++ b/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
@@ -1,8 +1,8 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:31,36-44)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:45,47-55)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:46,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:50,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:55,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:32,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:46,47-55)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:47,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:51,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:56,36-44)
 edges
 | test.c:5:10:5:22 | call to aligned_alloc | test.c:15:8:15:28 | call to aligned_alloc_wrapper | provenance |  |
 | test.c:8:29:8:31 | ptr | test.c:8:64:8:66 | ptr | provenance |  |
diff --git a/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected b/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected
index 7ebeb7a8c..176763dd7 100644
--- a/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected
+++ b/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected
@@ -1,5 +1,5 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:38,38-46)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:39,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:46,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:49,27-35)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:39,38-46)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:40,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:47,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:50,27-35)
 | test.c:6:24:6:30 | time_tm | The function `asctime` and `asctime_r` should be discouraged. Unsanitized input can overflow the output buffer. |
diff --git a/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected b/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected
index 4e14eb287..236fe8d56 100644
--- a/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected
+++ b/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected
@@ -1,10 +1,10 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:43,31-39)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:44,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:49,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:52,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:73,10-18)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:74,29-37)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:44,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:45,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:50,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:53,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:74,10-18)
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:75,29-37)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:76,29-37)
 | test.c:23:32:23:33 | ap | The value of ap is indeterminate after the $@. | test.c:17:7:17:19 | call to contains_zero | call to contains_zero |
 | test.c:26:10:26:11 | ap | The value of ap is indeterminate after the $@. | test.c:17:7:17:19 | call to contains_zero | call to contains_zero |
 | test.c:39:12:39:13 | ap | The value of ap is indeterminate after the $@. | test.c:35:7:35:19 | call to contains_zero | call to contains_zero |
diff --git a/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected b/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected
index ce13ee69a..e2ec75c5f 100644
--- a/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected
+++ b/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected
@@ -1,6 +1,6 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:110,11-19)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:110,31-39)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:111,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:111,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:111,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:112,9-17)
 | test.c:10:3:10:18 | call to log_local_unsafe | Asynchronous-unsafe function calls within a $@ can lead to undefined behavior. | test.c:16:7:16:12 | call to signal | signal handler |
 | test.c:11:3:11:6 | call to free | Asynchronous-unsafe function calls within a $@ can lead to undefined behavior. | test.c:16:7:16:12 | call to signal | signal handler |
 | test.c:46:3:46:9 | call to longjmp | Asynchronous-unsafe function calls within a $@ can lead to undefined behavior. | test.c:50:7:50:12 | call to signal | signal handler |
diff --git a/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected b/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected
index fb78049d2..6f7f3eba2 100644
--- a/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected
+++ b/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected
@@ -1,2 +1,2 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotReturnFromAComputationalExceptionHandler.ql:44,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotReturnFromAComputationalExceptionHandler.ql:45,5-13)
 | test.c:10:1:10:1 | return ... | Do not return from a $@ signal handler. | test.c:13:10:13:15 | SIGFPE | computational exception |
diff --git a/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected b/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected
index d95b48e1c..406d52b4d 100644
--- a/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected
+++ b/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected
@@ -1,18 +1,18 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:47,65-73)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:48,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:69,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:82,3-11)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,11-19)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,31-39)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,55-63)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:111,11-19)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:111,31-39)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:111,57-65)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:144,11-19)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:144,31-39)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:144,55-63)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:155,53-61)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:156,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:48,65-73)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:49,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:70,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:83,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:107,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:107,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:107,55-63)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:112,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:112,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:112,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:145,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:145,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:145,55-63)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:156,53-61)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:157,5-13)
 | test.c:7:3:7:3 | a | This operation may write to a string that may be a string literal that was $@. | test.c:6:13:6:20 | codeql | created here |
 | test.c:30:3:30:3 | a | This operation may write to a string that may be a string literal that was $@. | test.c:29:13:29:18 | call to strchr | created here |
 | test.c:36:3:36:3 | b | This operation may write to a string that may be a string literal that was $@. | test.c:35:13:35:18 | call to strchr | created here |
diff --git a/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected b/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected
index 9a87a6775..1988bf7c5 100644
--- a/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected
+++ b/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected
@@ -1,9 +1,9 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:62,31-39)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:62,55-63)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:68,31-39)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:68,54-62)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:62,5-18)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:68,5-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,55-63)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:69,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:69,54-62)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:69,5-18)
 | test.c:10:20:10:24 | Cod | Expression produces or consumes a string that may not have sufficient space for a null-terminator. |
 | test.c:16:3:16:9 | call to strncpy | Expression produces or consumes a string that may not have sufficient space for a null-terminator. |
 | test.c:26:3:26:10 | call to snprintf | Expression produces or consumes a string that may not have sufficient space for a null-terminator. |
diff --git a/c/misra/test/rules/RULE-13-2/UnsequencedAtomicReads.expected b/c/misra/test/rules/RULE-13-2/UnsequencedAtomicReads.expected
index 4fa06eb06..faba01de7 100644
--- a/c/misra/test/rules/RULE-13-2/UnsequencedAtomicReads.expected
+++ b/c/misra/test/rules/RULE-13-2/UnsequencedAtomicReads.expected
@@ -1,5 +1,5 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnsequencedAtomicReads.ql:112,31-39)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnsequencedAtomicReads.ql:112,67-75)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnsequencedAtomicReads.ql:112,5-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnsequencedAtomicReads.ql:113,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnsequencedAtomicReads.ql:113,67-75)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnsequencedAtomicReads.ql:113,5-18)
 | test.c:44:12:44:18 | ... + ... | Atomic variable $@ has a $@ that is unsequenced with $@. | test.c:42:15:42:16 | a1 | a1 | test.c:44:12:44:13 | a1 | previous read | test.c:44:17:44:18 | a1 | another read |
 | test.c:46:3:46:37 | ... + ... | Atomic variable $@ has a $@ that is unsequenced with $@. | test.c:42:15:42:16 | a1 | a1 | test.c:46:16:46:17 | a1 | previous read | test.c:46:35:46:36 | a1 | another read |
diff --git a/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected b/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
index 174c6aa40..06a15a6d5 100644
--- a/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
+++ b/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
@@ -1,9 +1,9 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:48,36-44)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:49,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:51,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:56,25-33)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:72,28-36)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:72,51-59)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:49,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:50,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:52,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:57,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:73,28-36)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:73,51-59)
 | test.c:18:6:18:6 | 0 | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
 | test.c:19:6:19:7 | ar | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
 | test.c:21:6:21:9 | ar2p | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
diff --git a/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected b/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
index 5ae49919a..d2a832c47 100644
--- a/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
+++ b/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
@@ -1,7 +1,7 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:23,54-62)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:24,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:50,20-28)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:58,43-56)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:24,54-62)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:25,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:51,20-28)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:59,43-56)
 edges
 | test.c:12:13:12:15 | a | test.c:14:10:14:10 | a | provenance |  |
 | test.c:12:13:12:15 | a | test.c:23:13:23:13 | a | provenance |  |
diff --git a/c/misra/test/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.expected b/c/misra/test/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.expected
index 46a295d75..a0a3649d0 100644
--- a/c/misra/test/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.expected
+++ b/c/misra/test/rules/RULE-22-16/MutexObjectsNotAlwaysUnlocked.expected
@@ -1,5 +1,5 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (MutexObjectsNotAlwaysUnlocked.ql:22,52-60)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (MutexObjectsNotAlwaysUnlocked.ql:30,42-50)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MutexObjectsNotAlwaysUnlocked.ql:23,52-60)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MutexObjectsNotAlwaysUnlocked.ql:31,42-50)
 | test.c:16:3:16:10 | call to mtx_lock | Mutex 'm' is locked here and may not always be subsequently unlocked. |
 | test.c:21:3:21:10 | call to mtx_lock | Mutex 'm' is locked here and may not always be subsequently unlocked. |
 | test.c:39:3:39:10 | call to mtx_lock | Mutex 'm' is locked here and may not always be subsequently unlocked. |
diff --git a/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected b/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
index 0365f4980..42450c084 100644
--- a/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
+++ b/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
@@ -1,4 +1,4 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (FileOpenForReadAndWriteOnDifferentStreams.ql:39,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (FileOpenForReadAndWriteOnDifferentStreams.ql:40,9-17)
 | test.c:6:14:6:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:5:14:5:18 | call to fopen | here |
 | test.c:17:14:17:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:16:14:16:18 | call to fopen | here |
 | test.c:33:14:33:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:32:14:32:18 | call to fopen | here |
diff --git a/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected b/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
index dbf08e3d3..67e9070e3 100644
--- a/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
+++ b/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
@@ -1,8 +1,8 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:19,32-40)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:20,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:25,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:31,21-29)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:33,6-14)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:36,28-36)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:20,32-40)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:21,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:26,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:32,21-29)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:34,6-14)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:37,28-36)
 | test.c:10:3:10:9 | call to fprintf | Attempt to write to a $@ opened as read-only. | test.c:9:14:9:18 | call to fopen | stream |
 | test.c:15:3:15:9 | call to fprintf | Attempt to write to a $@ opened as read-only. | test.c:18:14:18:18 | call to fopen | stream |
diff --git a/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected b/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
index 210a3a921..a1028b94d 100644
--- a/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
+++ b/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
@@ -1,10 +1,10 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:24,28-36)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:25,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:29,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:38,23-31)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:43,17-25)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:52,5-13)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:60,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:60,46-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:25,28-36)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:26,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:30,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:39,23-31)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:44,17-25)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:53,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:61,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:61,46-54)
 | test.c:6:7:6:20 | ... != ... | The check is not reliable as the type of the return value of $@ is converted. | test.c:5:14:5:20 | call to getchar | call to getchar |
 | test.c:13:7:13:15 | ... != ... | The check is not reliable as the type of the return value of $@ is converted. | test.c:12:14:12:20 | call to getchar | call to getchar |
diff --git a/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected b/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected
index 9c0d50ca8..9b7671750 100644
--- a/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected
+++ b/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected
@@ -1,4 +1,4 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AssignmentOperatorReturnThis.ql:25,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AssignmentOperatorReturnThis.ql:27,5-13)
 | test.cpp:10:12:10:20 | operator= | User-defined assignment operator $@ does not return *this | test.cpp:10:12:10:20 | operator= |  user defined assignment operator |
 | test.cpp:17:11:17:19 | operator= | User-defined assignment operator $@ does not return *this | test.cpp:17:11:17:19 | operator= |  user defined assignment operator |
 | test.cpp:24:12:24:20 | operator= | User-defined assignment operator $@ does not return *this | test.cpp:24:12:24:20 | operator= |  user defined assignment operator |
diff --git a/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected b/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected
index 529a7ccf9..4e0367587 100644
--- a/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected
+++ b/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected
@@ -1,12 +1,12 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:47,12-20)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:48,30-38)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:48,57-65)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:74,5-13)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:74,25-33)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:75,7-15)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,5-13)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,25-33)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,54-62)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:48,12-20)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:49,30-38)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:49,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:75,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:75,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:76,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:131,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:131,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:131,54-62)
 edges
 | test.cpp:12:16:12:27 | new [bad_alloc] | test.cpp:14:33:16:5 | { ... } [bad_alloc] |
 | test.cpp:13:7:13:28 | throw ... [exception] | test.cpp:14:33:16:5 | { ... } [exception] |
diff --git a/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected b/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
index bd46224da..4f3b8e28a 100644
--- a/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
+++ b/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
@@ -1,10 +1,10 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:26,67-75)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:27,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:39,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:50,34-42)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:50,57-65)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:58,25-33)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:70,3-16)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:27,67-75)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:28,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:40,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:51,34-42)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:51,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:59,25-33)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:71,3-16)
 edges
 | test.cpp:3:36:3:45 | new[] | test.cpp:19:27:19:44 | call to allocate_int_array | provenance |  |
 | test.cpp:3:36:3:45 | new[] | test.cpp:23:12:23:29 | call to allocate_int_array | provenance |  |
diff --git a/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected b/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
index 68cab835f..1ed591563 100644
--- a/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
+++ b/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
@@ -1,8 +1,8 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:55,34-42)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:58,33-41)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:60,26-34)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:74,5-18)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:79,41-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:56,34-42)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:59,33-41)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:61,26-34)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:75,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:80,41-54)
 | test.cpp:17:17:17:29 | new | StructA object of size 8 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
 | test.cpp:21:17:21:32 | new[] | StructA[] object of size 800 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
 | test.cpp:35:20:35:44 | call to make_shared | StructA object of size 8 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
diff --git a/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected b/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected
index 9e1cf41d3..356802085 100644
--- a/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected
+++ b/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected
@@ -1,4 +1,4 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:22,10-18)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:24,5-13)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:24,30-38)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:23,10-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:25,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:25,30-38)
 | test.cpp:8:5:8:6 | t2 | The argument $@ of `std::forward` may be indeterminate when accessed at this location. | test.cpp:7:45:7:46 | t2 | t2 |
diff --git a/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected b/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected
index 3287ba88d..f9ac1fb45 100644
--- a/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected
+++ b/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected
@@ -1,5 +1,5 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,3-11)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,23-31)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,51-59)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:28,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:28,23-31)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:28,51-59)
 | test.cpp:5:3:5:11 | return ... | Function test_refconst_return returns a reference or a pointer to $@ that is passed by reference to const. | test.cpp:4:44:4:44 | x | parameter |
 | test.cpp:8:3:8:14 | return ... | Function test_ptrconst_return returns a reference or a pointer to $@ that is passed by reference to const. | test.cpp:7:44:7:44 | x | parameter |
diff --git a/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected b/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected
index d0fe6416c..dddc13632 100644
--- a/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected
+++ b/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected
@@ -1,5 +1,5 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:27,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:36,10-18)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:37,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:28,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:37,10-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:38,5-13)
 | test.cpp:5:3:5:20 | ... &= ... | Modification of bit-representation of float originated at $@ | test.cpp:4:24:4:60 | reinterpret_cast<unsigned char *>... | cast |
 | test.cpp:12:3:12:14 | ... &= ... | Modification of bit-representation of float originated at $@ | test.cpp:11:18:11:30 | (uint8_t *)... | cast |
diff --git a/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected b/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected
index af7e9efc3..04ba9910b 100644
--- a/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected
+++ b/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected
@@ -1,5 +1,5 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstMemberFunctionReturnsNonConstPointer.ql:53,7-15)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstMemberFunctionReturnsNonConstPointer.ql:55,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstMemberFunctionReturnsNonConstPointer.ql:54,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstMemberFunctionReturnsNonConstPointer.ql:56,7-15)
 | test.cpp:8:8:8:11 | getA | Const member function returns a pointer to class data $@. | test.cpp:3:8:3:8 | a | a |
 | test.cpp:9:8:9:11 | getB | Const member function returns a pointer to class data $@. | test.cpp:4:8:4:8 | b | b |
 | test.cpp:11:6:11:12 | getThis | Const member function returns a pointer to class data $@. | test.cpp:11:36:11:39 | this | this |
diff --git a/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected b/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
index 6be9fd55c..f3d554d1d 100644
--- a/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
+++ b/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
@@ -1,12 +1,12 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:93,7-15)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:93,27-35)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:94,9-17)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:98,9-17)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:98,29-37)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:99,11-19)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:109,35-43)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:110,11-19)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:109,9-22)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:94,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:94,27-35)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:95,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:99,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:99,29-37)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:100,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:110,35-43)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:111,11-19)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:110,9-22)
 | test.cpp:8:42:8:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:8:3:8:11 | call to copy | call to copy |
 | test.cpp:17:42:17:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:17:3:17:11 | call to copy | call to copy |
 | test.cpp:55:42:55:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:55:3:55:11 | call to copy | call to copy |
diff --git a/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected b/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected
index d25d23185..cf14c62fa 100644
--- a/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected
+++ b/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected
@@ -1,9 +1,9 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:29,5-13)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:29,25-33)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:30,7-15)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:36,5-13)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:36,25-33)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:37,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:30,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:30,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:31,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:37,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:37,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:38,7-15)
 | test.cpp:7:3:7:15 | call to for_each | The $@ of iterator range function does not point to the end of an iterator. | test.cpp:7:28:7:32 | call to begin | argument |
 | test.cpp:7:3:7:15 | call to for_each | The $@ of iterator range function does not point to the start of an iterator. | test.cpp:7:19:7:21 | call to end | argument |
 | test.cpp:8:3:8:15 | call to for_each | The $@ of iterator range function does not point to the end of an iterator. | test.cpp:8:30:8:34 | call to begin | argument |
diff --git a/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected b/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected
index db3b7358d..5e7ca23be 100644
--- a/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected
+++ b/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected
@@ -1,12 +1,12 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:44,5-13)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:44,25-33)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:44,51-59)
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:45,5-13)
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:45,25-33)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:45,52-60)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:80,5-13)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:80,25-33)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:81,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:45,51-59)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:46,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:46,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:46,52-60)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:81,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:81,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:82,7-15)
 | test.cpp:8:7:8:7 | i | Increment of iterator may overflow since its bounds are not checked. |
 | test.cpp:9:9:9:9 | i | Increment of iterator may overflow since its bounds are not checked. |
 | test.cpp:10:9:10:9 | i | Increment of iterator may overflow since its bounds are not checked. |
diff --git a/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected b/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
index 51ef13412..8844f268b 100644
--- a/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
+++ b/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
@@ -1,7 +1,7 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:46,62-70)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:47,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:56,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:62,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:47,62-70)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:48,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:57,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:63,3-11)
 edges
 | test.cpp:15:19:15:21 | foo | test.cpp:16:24:16:26 | foo | provenance |  |
 | test.cpp:15:19:15:21 | foo | test.cpp:16:51:16:53 | foo | provenance |  |
diff --git a/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected b/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
index 8b7a4902c..ec3a871b6 100644
--- a/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
+++ b/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
@@ -1,7 +1,7 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:24,44-52)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:25,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:27,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:32,33-41)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:25,44-52)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:26,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:28,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:33,33-41)
 edges
 | test.cpp:6:19:6:37 | new[] | test.cpp:9:12:9:13 | l1 | provenance |  |
 | test.cpp:7:22:7:40 | new[] | test.cpp:10:12:10:13 | l2 | provenance |  |
diff --git a/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected b/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected
index 41fa58045..730d0908f 100644
--- a/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected
+++ b/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected
@@ -1,9 +1,9 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:64,5-13)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:66,36-44)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:82,46-54)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:83,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:87,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:90,35-43)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:95,38-46)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:65,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:67,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:83,46-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:84,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:88,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:91,35-43)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:96,38-46)
 | test.cpp:24:7:24:34 | new | nothrow new allocation of $@ returns here without a subsequent check to see whether the pointer is valid. | test.cpp:24:7:24:34 | new | StructA * |
 | test.cpp:40:17:40:38 | call to allocate_without_check | nothrow new allocation of $@ returns here without a subsequent check to see whether the pointer is valid. | test.cpp:35:17:35:44 | new | StructA * |
diff --git a/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected b/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected
index 606ccbff2..bd63636e6 100644
--- a/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected
+++ b/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected
@@ -1,4 +1,4 @@
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (BadlySeededRandomNumberGenerator.ql:42,7-20)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (BadlySeededRandomNumberGenerator.ql:43,7-20)
 | test.cpp:9:33:9:33 | call to linear_congruential_engine | Random number generator linear_congruential_engine is default-initialized and is therefore not properly seeded. |
 | test.cpp:10:30:10:31 | call to linear_congruential_engine | Random number generator linear_congruential_engine is default-initialized and is therefore not properly seeded. |
 | test.cpp:11:21:11:22 | call to linear_congruential_engine | Random number generator linear_congruential_engine is default-initialized and is therefore not properly seeded. |

From 0aa483c5fde67e3e234b6355ffeadf554adb7d9e Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 8 Dec 2025 15:45:57 -0800
Subject: [PATCH 09/10] Add documentation for baseline suites.

---
 change_notes/2025-12-8-add-baseline-suites.md |  6 +++
 docs/development_handbook.md                  |  1 +
 docs/user_manual.md                           | 37 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 change_notes/2025-12-8-add-baseline-suites.md

diff --git a/change_notes/2025-12-8-add-baseline-suites.md b/change_notes/2025-12-8-add-baseline-suites.md
new file mode 100644
index 000000000..024860fe4
--- /dev/null
+++ b/change_notes/2025-12-8-add-baseline-suites.md
@@ -0,0 +1,6 @@
+ - Added tags `codingstandards/baseline/safety` and `codingstandards/baseline/style` to various rules
+   - These tags are intended to be applied to rules that are well supported, have low false positive rates, and widely applicable, even beyond safety-critical systems that want strict adherence to any particular coding standard for compliance purposes.
+ - Added packs `coding-standards-cpp-baseline` and `coding-standards-c-baseline`
+   - These packs have default query suites that include both `safety` and `style` baseline rules for C++ and C coding standards respectively.
+   - These packs are designed to be suitable for a wide variety of C/C++ projects that are interested in additional code quality and safety checks without the full strictness of a specific coding standard.
+   - In additional to the default suites which have both style and safety rules, these packs contain `c??-baseline-safety` and `c??-baseline-style` query suites for each area of focus. 
\ No newline at end of file
diff --git a/docs/development_handbook.md b/docs/development_handbook.md
index 83670dbbc..73c840b54 100644
--- a/docs/development_handbook.md
+++ b/docs/development_handbook.md
@@ -265,6 +265,7 @@ The `generate_package_description.py` script provides a "best-effort" approach t
     - `maintainability` - if the query identifies an issue which makes the code harder to maintain.
     - `performance` - if the query identifies an issue which has a negative impact on the performance of the code.
     - `concurrency` - if the query identifies a concurrency issue.
+    - `coding-standards/baseline/safety` or `/style` - if the query is part of the baseline safety suite. See the user manual for our definition of `safety` vs `style`.
   - Validate the rule package description file using the `validate-rule-package.py` script that validates the rule package descriptions against the schema `rule-package.schema.json` located in the `schemas` directory.
     - `python3.9 scripts/validate-rule-package.py <rule_package_name>`
 
diff --git a/docs/user_manual.md b/docs/user_manual.md
index b886722be..5f958fdb6 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -33,6 +33,7 @@
 | 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                                                              |
 | 0.27.0  | 2025-05-15 | Luke Cartey     | Documented completed support for MISRA C 2023.                                                                          |
+| 0.28.0  | 2025-12-08 | Mike Fairhurst  | Add baseline query suites for C and C++ coding standards.                                                               |
 
 ## Release information
 
@@ -90,6 +91,25 @@ The datasheet _"CodeQL Coding Standards: supported rules"_, provided with each r
 [^5]: The unimplemented supportable MISRA C 2023 rules are `Rule 9.5`, `Rule 9.6`, `Rule 17.13`. `Rule 9.5`, `Rule 9.6` and `Rule 17.13` require additional support in the CodeQL CLI to ensure the required information is available in the CodeQL database to identify violations of these rules. Note: `Dir 4.14` is covered by the default CodeQL queries, which identify potential security vulnerabilities caused by not validating external input.
 [^6]: The rules `5.13.7`, `19.0.1` and `19.1.2` are not planned to be implemented by CodeQL as they are compiler checked in all supported compilers.
 
+## Baseline suites
+
+Queries that are part of the above rules may additionally be added to our C or C++ "baseline suites." The baseline suites are not intended for compliance with any particular coding standard, but rather to provide a set of well-supported, less opinionated, low false positive rate rules. Project maintainers interested in additional code quality and safety checks, and have no specific compliance requirements, may find these suites useful.
+
+Baseline suites are separated by language (C or C++) and area of focus (`safety` or `style`). The difference between style and safety is not always clear-cut. Our project uses the following guidelines to determine whether a rule is more focused on safety or style:
+
+| Characteristic     | Focus  | Description |
+|--------------------|--------|-------------|
+| Simplicity         | Style  | Simpler concepts tend to be added to the style suite. |
+| Severity           | Safety | Rules that prevent potentially severe issues tend to be added to the safety suite. |
+| Undefined behavior | Safety | Rules that detect undefined behavior tend to be added to the safety suite. |
+| Bug detection      | Safety | Rules detecting misuse of an API or language feature tend to be added to the safety suite. |
+| Opinionated        | Style  | More opinionated rules tend to be added to the style suite. |
+| Habit-enforcing    | Style  | Rules that enforce common coding habits tend to be added to the style suite. |
+| Bans               | Style  | Rules that ban certain language features or coding patterns tend to be added to the style suite. |
+| Remediatability    | Style  | Rules that are easy to remediate tend to be added to the style suite. |
+
+Only the rules in the baseline suites are categorized into `safety` and `style`, the remaining rules are not. Some baseline rules may be categorized as both `safety` and `style`, though this is kept to a minimum.
+
 ## Supported environment
 
 This section describes the supported environment for the product.
@@ -254,12 +274,27 @@ If you have downloaded a release artifact containing the packs, you will need to
 
 Alternatively, the packs can be made available to CodeQL without specification on the comamnd line by placing them inside the distribution under the `qlpacks/codeql/` directory, or placed inside a directory adjacent to the folder containing the distribution.
 
+##### Running the baseline suites
+
+Once you have a CodeQL database for your project you can run the baseline style and safety checks using the `codeql database analyze` command by specifying the baseline QL pack which you want to run as an argument, along with a version specifier:
+
+```bash
+codeql database analyze --format=sarifv2.1.0 --output=<name-of-results-file>.sarif path/to/<output_database_name> advanced-security/coding-standards-<language>-baseline@version
+```
+
+The output of this command will be a [SARIF file](https://sarifweb.azurewebsites.net/) called `<name-of-results-file>.sarif`.
+
 ##### Alternative query sets
 
-Each supported standard includes a variety of query suites, which enable the running of different sets of queries based on specified properties. In addition, a custom query suite can be defined as specified by the CodeQL CLI documentation, in order to select any arbitrary sets of queries in this repository. To run
+Each supported standard includes a variety of query suites, which enable the running of different sets of queries based on specified properties. The baseline suites optionally expose `safety` and `style` suites as described in the section _Baseline suites_. In addition, any arbitrary set of queries from this repository can be selected via custom query suites as specified by the CodeQL CLI documentation.
+
+To run
 
 ```bash
+# For a specific coding standard
 codeql database analyze --format=sarifv2.1.0 --output=<name-of-results-file>.sarif path/to/<output_database_name> codeql/<standard>-<language>-coding-standard@version:codeql-suites/<alternative-suite>.qls
+# or for baseline suites
+codeql database analyze --format=sarifv2.1.0 --output=<name-of-results-file>.sarif path/to/<output_database_name> advanced-security/coding-standards-<language>-baseline@version:codeql-suites/<alternative-suite>.qls
 ```
 
 If modifying the query suite, ensure that all Rules you expect to be covered by CodeQL in your Guideline Enforcement Plan (or similar) are included in the query suite, by running:

From f10156fcd788b2bdfa9bc5f8ce3f8d62726caa75 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 8 Dec 2025 15:47:25 -0800
Subject: [PATCH 10/10] Add readme changes

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 02c226f84..324ac4758 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,10 @@ The following standards are under active development for [C++17](https://www.iso
 
 - [MISRA C++ 2023](https://misra.org.uk/product/misra-cpp2023/) - under development - _scheduled for release 2025 Q2/Q3_
 
+## Baseline suites
+
+In addition to supporting the above coding standards, we also export "baseline" query suites for C and C++ which contain a selection of well-supported, less opinionated, low false positive rate rules. These baseline suites are intended to be suitable for a wide variety of C/C++ projects that are interested in additional code quality and safety checks without the full strictness of a specific coding standard.
+
 ## How do I use the CodeQL Coding Standards Queries?
 
 The use of the CodeQL Coding Standards is extensively documented in the [user manual](docs/user_manual.md).