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 1/2] 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 b7d2d5604c..fa1279fce8 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 0000000000..a45ea8f438
--- /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 0000000000..a538470754
--- /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 0000000000..6ad50277ba
--- /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 0000000000..bce7541ea9
--- /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 0000000000..982fa68144
--- /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 1356777e5f..890f0a48ec 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 e42437042f..274f381f38 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 1e03c089e8..908e1aa858 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 345623fe0d..5d5af628ad 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 40c4e936dd..c70fe0329c 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 3ea9e1e1fd..09bd234f63 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 c9bcaa6bd2..b58579d524 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 d0d948d9b2..86b7e373ce 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 3b2ae558d8..736416f118 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 6ef617ca72..30b56ad257 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 0ec195868f..aad09e207c 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 57be1bc488..47e5bb20f6 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 2e1064ee9d..c890aacf5a 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 d6000852c6..e3cb2d1f2f 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 6f06174b99..3fd118f127 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 f69a78ba2c..c56bb6f906 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 b4d4a74d57..072ee27669 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 19cf28b3e9..40d3b15b94 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 af54dfa823..2a9ee5d569 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 784b7898d6..dd4c431048 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 13f7e40303..401fb4ce88 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 a7ccf8c041..58468d1fe6 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 146d0cb30f..3c08898928 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 891b93bcda..e97716a89a 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 3f7d9ae142..15594de9ec 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 6d223dab72..fbcfaa2aa8 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 4c5ba57504..0b7dde938d 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 9d8e4b16d4..9ffde045b9 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 4aced57136..4879c4675b 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 31618785d2..c0b7c8afce 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 549e57236a..6a7e406e0d 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 81ecf56ccf..b38a62c814 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 ad3a2c8192..111e17b13e 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 5b5a043395..ab66a396ad 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 09289d1f79..1df6e26be8 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 9b0882ac66..5fbe5695ec 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 5c7d759606..5986fb70e0 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 85369b502e..5ce99960a9 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 dc52dca487..a0075a5ef8 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 8ed99d4541..4758431e43 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 a042d80ba5..24686fae58 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 8735a804fa..e23b66b268 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 1bc372506d..e8487eb2ad 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 59ab0df670..53283c041d 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 2ed5035ff0..19f94ecc3c 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 b4d2a9127b..ab184f11eb 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 90c34a44a2..92e95552a5 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 722e6fff80..b971a17973 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 85623d9390..ca20b48583 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 67fa83e852..4fe66932f0 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 56613c1943..4d711d45f4 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 746cea2e9f..30cc1f9f4a 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 322048f6de..54775b0bf4 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 0a777dc25d..ba5c05c648 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 e5dc33f817..2e1e5c9224 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 0586c40c36..76f4f0c1bb 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 bd65019f98..8d67cf267f 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 397e1bfc9e..f77f549489 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 437b13f7f9..55efeb0711 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 a29dbd34b9..8bbe466827 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 58b2b1c7dd..c0b9d2dfc3 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 338437b5b2..6ba7ec185d 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 272a411f0e..fc3415dc49 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 5dd78fc340..861c1a0ba3 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 582715e34f..20bb65df24 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 5d949f56ed..a444d81e10 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 4994c4ea6e..80b9476ec1 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 645285f438..d7a16f782f 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 9d10522ecf..541ec4c0b4 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 ba800885ef..8fab940504 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 9f9953aa6f..8cc95a79a4 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 2b5cdaa851..c722c9ca57 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 e8abf1bbfb..4896ca3066 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 6440e84070..a9955db892 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 5c16dc1afb..22e2a00c26 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 82ac620aa7..bd0ecba460 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 28b256e85c..63f8fe5e73 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 bccb382804..41da3185e1 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 1ebbf184bb..810227c8f7 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 2e080419e1..58c6f40728 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 5085e5dc7b..b47b8f8de4 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 69ecbede58..dcf720e6df 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 86756668a8..7e6a834b50 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 90b0315e88..2d288607e8 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 c840947b1f..fc4bb8f9a3 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 759ad9b06a..f96982032b 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 3d351c898e..59c1173e47 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 1bd2708750..5372cb9c3e 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 84c7dbd408..1d1353de66 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 623fb9baed..9da281a0dc 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 a88f3170de..d51e3493ea 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 9cc5bf9dda..db2313fb21 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 f84c142414..3c6a45bb5a 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 1d446f323f..05780aa286 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 4ceca23d8f..fc16d511c8 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 644994562a..059a3f3a74 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 45ad0519bb..237e4d7c02 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 5a93477b9a..f69a0a7409 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 0259f8023d..bd59c83440 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 4dd939effe..a26699f065 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 af6c9bccad..f956fcec66 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 1529a403c9..df21468e0a 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 1a142ddb22..194b89fce6 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 0a1232b6ad..fce081cba2 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 dedac9da9e..10989476ff 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 dc1433d5e4..81a0996fb0 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 f467c41804..419199502d 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 efbc8d1334..a89d12152b 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 6a520447d1..d29bfde9f5 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 73f0732ba5..f840e5ec51 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 cf19c02eca..d6e8683644 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 da73214859..9593ec19b0 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 5ccc8316ec..ad9856a42c 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 31c24dcdd8..5460824b82 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 33de4f84b6..76b4e44e55 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 020338913a..f8c5c90c69 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 97c3808607..05f6fc17a2 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 b4c6bbf42c..03a3284ee4 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 2b5a8e8c1d..2943bcd009 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 7838c5fc1f..76e5d07318 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 13355b7f74..66d155800b 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 ba78abcb5e..a4e0c1726a 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 fc87186d3e..e1299f1a8a 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 d9942c3e56..0e2e6525b3 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 210e081bb1..e1dbfad2d7 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 15bec51bf8..a224ce0eae 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 e0fc8e4510..017cc85d66 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 be6f3c00f3..d4852715c4 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 b7ccf534fa..9ec9197c70 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 b487f5b9b5..c9d68e4598 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 28dce7b638..ed1619b03f 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 31d3434c58..fa2a37d834 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 22ccc14b69..f12ca680d4 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 6fa3ad92be..2d342d7891 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 6441add7fc..5adb6adcd5 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 e7e97e2639..194ecf15be 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 34d3b62b2c..6f844caab3 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 8066cc80cb..189bf5746a 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 929eb5bd0a..e666077cc9 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 88ad0aa6db..924788fa6a 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 ce781403b1..7f67be8087 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 d888d87b6c..022b83f45b 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 ca5853dac9..b9d590097d 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 50e5350936..432cd3229d 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 1a6476b1a7..ab6059c43d 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 a122a0bec4..383f3c49ba 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 c86c9b9d9d..87e389b173 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 d85183a831..2d1b850e5c 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 0d5aa5399f..e19d4cb029 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 cdbe8e2c16..aa1977e31f 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 1edf4aa9c3..7937792845 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 642813bbab..0b78107027 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 2439d4ca47..28b751b79f 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 05cc4e3433..db6c6c64b3 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 64318dbedd..834d434758 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 1da495ca28..90a0d39239 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 6a39070ef0..efaa647259 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 274bf5b2ae..e06f571271 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 1a76339f50..9754a1bef8 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 603c44e8e1..3134960d83 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 d7fcb13d76..08c438e7ee 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 dc4ab081d3..7240d0a7a6 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 2d707548fa..f29f688687 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 f2961e2638..7369e95208 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 04952ae960..f5026aa995 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 6e443bd162..85b00d647c 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 f1fd85b129..e51b6e728d 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 0f04a7362b..6193daeadb 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 2c2c302bc0..0b1d6be562 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 eb24d1c094..65329cc896 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 d8a78cb680..734cbe2e02 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 142a0b542d..b941391c71 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 4befbb9dd6..1dbca0094f 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 47e88196d5..0ff64db47a 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 6484372f5b..88dbb3cd76 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 250c00ca2e..3dd7c41801 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 6ebabc3810..c3488e1e6c 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 cff7d0df5c..fb5ccaea50 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 dc82f63d10..7260dd042b 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 df9f3f2d1c..fbb81d0464 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 4a0cd9d50b..fb0e39aad4 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 f4e0d93d92..4f70f08a46 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 1136dd714e..37f5888a78 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 c3a5ce897f..8fabae7f8e 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 877ef19d2a..fc397d6d59 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 f3204ef2e3..c78d56ab58 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 c5a9ae4814..5a1d833ad6 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 d10c8315e1..724d5d94c9 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 dfe3fd8fff..873b4d2438 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 5f7fb803d6..9eb3d25e99 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 a1c6fb1fa8..16ab39817f 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 11a3056286..047aba1bc4 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 a0a69f4ec8..749c3c5203 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 bb51e38a6d..27321c1a27 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 6f0cf190a4..8614341e5b 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 c534f9e591..1a2e89a648 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 71e2fc9a03..a04bb0a8c3 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 a71d49d844..6541f8bcea 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 4e6b7d6f0c..1ffcfd8b7f 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 ced94c5bdd..b8441dfc02 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 0f8b571861..f347ad9095 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 b484509e63..24c6a80759 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 932fceba3a..6ce1f6e3c0 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 94214e8992..62005d0b96 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 c4c457bef7..7e836b845a 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 b2f101082f..ca7df79d89 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 1b3a3cfed2..4213b8273d 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 ce3a10f31d..78fbfc5305 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 61f520e004..c95a19f5e4 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 a12602c7ae..a14efc0fef 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 b8ad76cc37..500354aa3b 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 87f7af2ade..e530653587 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 69ffae87e5..95aa75c7d4 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 fc4ac468c1..6bb345a0d6 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 18a373e935..25e291335a 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 136de7ceea..300d75825b 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 99d5393171..aafe2eb9a9 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 9300bb9d1e..561cf2e6e7 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 5bbe181927..5c83ee5434 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 4b9d187dc1..0dff356a2a 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 353c985137..c4ec8d6870 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 244dfefc5b..1796700246 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 5d4cd71c79..c8e2d4bfc5 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 24be6ef3e7..dfec63f565 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 cbf956ce16..ac15e59131 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 cf83f055bd..6c9689a06c 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 f2cf835a2b..be1ebff146 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 3d8e14c855..7b73a52c7c 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 c85eba435d..749127565e 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 9f594f1ed3..2b5b6379fe 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 72de362ebc..d31796983e 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 e268ec75d9..18952c4ea5 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 a3acf916ec..c5a81aad82 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 0f1d9a3271..545d1880f8 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 1e0f297435..1814f18380 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 234a1c917b..61e7a3fd3d 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 cd7d7c42cd..27925c0f82 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 aafce46f7a..ea4a1c8e93 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 3467ff513d..854fbb1cff 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 d67058868c..a04330488f 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 4beb91e8f4..cae4b01b56 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 c4032537c0..8a12dae8ef 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 15847cd908..120254d7f1 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 3a6f335167..fbe504d56f 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 9b250e487a..e694e92fe4 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 39971f3981..7b2da0c6e7 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 2e866c9f2d..301949f612 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 77cf0ba353..8d65e49326 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 7d3d630d95..1aec8c4ef4 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 26a755eb2a..88a98dbdd8 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 1520955716..d7ef42c93b 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 825347754d..93d467a623 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 e342c53d00..c733655644 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 e3a78ce30c..46f4cd7dde 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 b6aa698e65..268ebe30c0 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 8da5de6878..5e1a542593 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 29b660a464..028e2049b8 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 03b891e6db..046a9bb1fa 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 9a5b6abfb4..deea04b155 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 b46c445965..108df61dcf 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 26e877d75f..2e453999ba 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 d8d3ee0240..e439d0f2a6 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 af0d66f22b..eb9f376286 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 c36bda6cdd..0eca2915af 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 0284b3ba14..472340eb21 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 d594d2379e..40aaea446b 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 180cbf7224..582a00503b 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 c16e5461f0..1315c39235 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 479d09eb6e..5661aca4b2 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 4b6c037aba..40a394ba47 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 1b41fe81bc..7a483303b4 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 67fc3944f4..0e57537500 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 559c436201..454a4c3bcd 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 4a7f626d03..c30fcac30d 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 7dfed7aad7..5d00981738 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 9f99e7c356..e9d96f3284 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 f5ca9c210d..bc06b5f0dc 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 54a6ba89e1..856b2d3220 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 ba0c499add..0d07ca0051 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 e324dd128f..d242c4ec61 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 23c75bff91..1a69853de9 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 38312b7b1a..2b3dba0f9e 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 761ef27ebb..f71cf43db6 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 2a53875067..a2d10d6cc9 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 5e821fc5ff..d6ec60794f 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 8aabeac1e6..a0ee1c2b36 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 9ba6ad319e..209d29c05b 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 f054b3b25a..6baeebe73a 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 b689edab6b..dabf04ed16 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 87d9af147b..541cde7a10 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 e01f2e3343..a20d530ba7 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 279ad08f3c..40bc612de9 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 13b49dc48b..b9febed7dc 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 2d5a498656..60741e1f83 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 a403c6b533..8b6be58cb8 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 d6d4f6130a..aed9b58277 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 2ce4319df1..f0dc70d128 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 d5d5490fe9..82fcc049d7 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 ef9940ff5a..b8ec1eeb67 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 ad5d184118..539c71648f 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 086aa40ae7..90af2e0429 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 7017d5e7de..dcbcf163ab 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 94f0bc6062..efa1fc507a 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 fb41c3b6b9..3c5ac437df 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 2573c57f24..5a442b3f02 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 b3566a1e27..d541d8de3a 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 f550a456dc..04df5015ec 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 2f0740e18a..10109de975 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 07953dd9f1..c19acc7786 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 24ac2298b5..04c1d6b6a5 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 3b12bf2ef3..77c70a9bfe 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 5dd49dce59..684b9b170a 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 0f9540ea21..c253c1eebc 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 8d20712021..f83662ea4e 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 f97aba1a4c..ffb032b260 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 a8676bf9f2..1ee18f2d8b 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 f837e5de71..11458704fb 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 84f7a00ba9..b308823ec9 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 bde6e8ddee..b937f53b93 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 5a2a1e7b30..427d352c78 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 cb5aa9d105..19b00c70ab 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 9ebdeb17c8..2e3cbada06 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 a0ef5143e9..796c531bcf 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 559b41527c..4aeec84709 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 0000000000..a45ea8f438
--- /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 0000000000..ff81bf65e6
--- /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 0000000000..b88b28338e
--- /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 0000000000..2218acb775
--- /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 0000000000..84933c15b5
--- /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 53f362e275..e965612675 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 c15dfca5fc..86e6bdec43 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 ac09d41c42..4386921e9f 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 9ca1a89525..d94f65bce9 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 d83b3d520b..bb89d0c68f 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 84255dbfc7..a4fa80f525 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 d4f43c7d09..bdb3b997ce 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 0652f065cb..4e8afd6e7d 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 b022869136..f119e89648 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 1512a7fd99..cd6a9444b7 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 2401bcbf54..2b156b1c6b 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 c6ea2c4518..74f235e883 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 b4ac267225..e8db5e6987 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 b24988823c..b1e5e4d020 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 f576144c46..730a8f9f75 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 45aa70dc31..c575644bb9 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 8f168e90c8..dcb0bd844b 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 4eb94f3d1d..f55a8aa400 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 6f625fd308..fbe7c343d2 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 81242bc0f4..7d7a9e3852 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 2b8b364c7d..a84c93cb33 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 548b7b4b94..c4e5ff63e5 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 4fe89c634d..1c723fd7a4 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 05d04de99e..ebef7de1cf 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 f8447d4af5..b822cfdce3 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 6c9cb2e436..3e4430a17e 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 8587a73c33..b80f9b17ff 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 c3e0aeb2f5..143c3b9a64 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 5831a7f404..13208d694d 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 6180bf2f83..6cd55e3a81 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 61a145c7a1..3ab5918dc6 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 8cc9c47854..dcff5dc25c 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 e5451a0fc4..fdd2e9848f 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 d0935cc798..417a384cef 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 9839fae0fd..7dfd2b6e74 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 534bb83796..9c71c89ad4 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 ea2349194b..ebea7372bb 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 935218f78e..9c89c42fd2 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 b537fa34c5..d5ffa6c634 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 1d34680261..1f2662c8ca 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 ce340d63c8..c510ce0749 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 1268d1c82b..b8e7b0de1e 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 eb76ba6187..2bf272a733 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 64bfb4673b..695eb7fd17 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 0e8847257c..307e0419c5 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 a4ae635289..20f25909a0 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 48e534bfbb..7c878528af 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 0333955f72..e645a5630f 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 a444692594..0634f376a3 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 8c31fc104c..1ff132e762 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 70fd363c64..356e3d0ff9 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 90685f1c96..d4c1c188d4 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 fe6fff2d4f..f0769fc602 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 fca9190552..706d39179d 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 d623e85a50..26ca448a7e 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 fd8f4f3a04..076c2bd60d 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 2740498eef..ba8f100b4b 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 072c69201f..7f09dc7c89 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 da4b63200b..401806277e 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 6c3d18c27f..510f898421 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 b67cec99f3..eacf228120 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 5322fbbde3..ae8562e59d 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 dcf42a78f4..ef850a17e2 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 5044b3b421..c4ddcc459f 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 885d8caa0a..d5962ca610 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 1c3df97cfa..cfa4b9c334 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 4cb654730b..ace00e5912 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 190c4d720d..92597beae5 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 b42b54ef6c..57eaac45ec 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 844d0f54bb..051c397b0f 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 27c63c2c16..99c7276ba3 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 72d640f29b..c9951e5fbc 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 202123c11c..049dcf7c17 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 981bd1ce5b..5f436baf53 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 4d59b36b52..c1f83a11a2 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 9ac17e84a0..edaeef9b13 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 9ad0593702..454ede1574 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 2cd08be70a..41de6d7ae3 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 59f56207cd..9c2b4e4c07 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 a6337e2fcf..9842987794 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 21c29f54ef..6805fd9563 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 c92f2b2316..964adba12a 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 2/2] 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 982fa68144..806e62f200 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 84933c15b5..daa3884176 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