diff --git a/.github/lexicon.txt b/.github/lexicon.txt
index 305498fdc59..5e7d6dbbf75 100644
--- a/.github/lexicon.txt
+++ b/.github/lexicon.txt
@@ -1521,6 +1521,7 @@ prstc
 prttc
 prv
 prvaddcurrenttasktodelayedlist
+prvcheckforrunstatechange
 prvcheckinterfaces
 prvchecktaskswaitingtermination
 prvcopydatatoqueue
diff --git a/.github/scripts/kernel_checker.py b/.github/scripts/kernel_checker.py
index f24bbf25722..a0706932fe0 100755
--- a/.github/scripts/kernel_checker.py
+++ b/.github/scripts/kernel_checker.py
@@ -87,7 +87,8 @@
     r'.*\.git.*',
     r'.*portable/IAR/AtmelSAM7S64/.*AT91SAM7.*',
     r'.*portable/GCC/ARM7_AT91SAM7S/.*',
-    r'.*portable/MPLAB/PIC18F/stdio.h'
+    r'.*portable/MPLAB/PIC18F/stdio.h',
+    r'.*portable/ThirdParty/xClang/XCOREAI/*'
 ]
 
 KERNEL_THIRD_PARTY_PATTERNS = [
diff --git a/portable/ThirdParty/xClang/XCOREAI/portasm.S b/portable/ThirdParty/xClang/XCOREAI/portasm.S
index 702e9a2f021..7445672a08e 100644
--- a/portable/ThirdParty/xClang/XCOREAI/portasm.S
+++ b/portable/ThirdParty/xClang/XCOREAI/portasm.S
@@ -87,7 +87,7 @@ rtos_interrupt_callback_common:
   bla    r1}             /* and call the callback function. */
 
  {set    sp,     r4      /* Restore the task's SP now. */
- 
+
   get    r11,    id}                           /* Get the logical core ID into r11. */
   ldaw   r0,     dp[rtos_core_map]
   ldw    r0,     r0[r11]                       /* Translate to the RTOS core ID into r0. */
diff --git a/tasks.c b/tasks.c
index 400da8f73c1..9ed0ddfd331 100644
--- a/tasks.c
+++ b/tasks.c
@@ -294,7 +294,7 @@ typedef BaseType_t TaskRunning_t;
 /* Code below here allows infinite loop controlling, especially for the infinite loop
  * in idle task function (for example when performing unit tests). */
 #ifndef INFINITE_LOOP
-    #define INFINITE_LOOP()  1
+    #define INFINITE_LOOP()    1
 #endif
 
 /*
@@ -460,8 +460,8 @@ PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended = ( UBaseType_t
 
 /* Do not move these variables to function scope as doing so prevents the
  * code working with debuggers that need to remove the static qualifier. */
-    PRIVILEGED_DATA static configRUN_TIME_COUNTER_TYPE ulTaskSwitchedInTime[ configNUMBER_OF_CORES ] = { 0UL };    /**< Holds the value of a timer/counter the last time a task was switched in. */
-    PRIVILEGED_DATA static volatile configRUN_TIME_COUNTER_TYPE ulTotalRunTime[ configNUMBER_OF_CORES ] = { 0UL }; /**< Holds the total amount of execution time as defined by the run time counter clock. */
+PRIVILEGED_DATA static configRUN_TIME_COUNTER_TYPE ulTaskSwitchedInTime[ configNUMBER_OF_CORES ] = { 0UL };    /**< Holds the value of a timer/counter the last time a task was switched in. */
+PRIVILEGED_DATA static volatile configRUN_TIME_COUNTER_TYPE ulTotalRunTime[ configNUMBER_OF_CORES ] = { 0UL }; /**< Holds the total amount of execution time as defined by the run time counter clock. */
 
 #endif
 
@@ -796,7 +796,6 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
              * than priority level of currently ready tasks. */
             if( pxTCB->uxPriority >= uxTopReadyPriority )
         #else
-
             /* Yield is not required for a task which is already running. */
             if( taskTASK_IS_RUNNING( pxTCB ) == pdFALSE )
         #endif
@@ -3738,7 +3737,7 @@ char * pcTaskGetName( TaskHandle_t xTaskToQuery ) /*lint !e971 Unqualified char
 
             return pxReturn;
         }
-    #else
+    #else /* if ( configNUMBER_OF_CORES == 1 ) */
         static TCB_t * prvSearchForNameWithinSingleList( List_t * pxList,
                                                          const char pcNameToQuery[] )
         {