diff --git a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
index ad2a89f08c..cc2ec3b6c3 100644
--- a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
+++ b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
@@ -145,6 +145,9 @@ public function format($format, $settings = []) {
             if ($code == 'F') {
               $options['context'] = 'Long month name';
             }
+            if ($code == 'M') {
+              $options['context'] = 'Abbreviated month name';
+            }
 
             if ($code == '') {
               $this->formatTranslationCache[$langcode][$code][$string] = $string;
diff --git a/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php b/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
index 0db4a607ea..f178541dc8 100644
--- a/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
@@ -262,6 +262,7 @@ public function testLanguageContext() {
     // We cast the return value of t() to string so as to retrieve the
     // translated value, rendered as a string.
     $this->assertSame('Svibanj', (string) t('May', [], ['langcode' => 'hr', 'context' => 'Long month name']), 'Long month name context is working.');
+    $this->assertSame('Svib.', (string) t('May', [], ['langcode' => 'hr', 'context' => 'Abbreviated month name']), 'Abbreviated month name context is working.');
     $this->assertSame('Svi.', (string) t('May', [], ['langcode' => 'hr']), 'Default context is working.');
   }