diff --git a/core/includes/form.inc b/core/includes/form.inc
index ce5779c..4f91ffc 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -2807,6 +2807,11 @@ function theme_form_required_marker($variables) {
     'class' => 'form-required',
     'aria-hidden' => 'true',
   );
+  // Checking if there are custom attributes 
+  if (isset($variables['#attributes'])) {
+  	$attributes = array_merge($attributes, $variables['#attributes']);
+  }
+  
   return '<span' . new Attribute($attributes) . '>*</span>';
 }
 
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php b/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
index 19f6a3d..4fe2d64 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
@@ -12,6 +12,9 @@
 use Drupal\Core\Database\Query\SelectInterface;
 use Drupal\Core\Database\Query\Condition as SqlCondition;
 
+/**
+ * Extends a class from ConditionBase to implement SQL condition clause. 
+ */
 class Condition extends ConditionBase {
 
   /**
@@ -22,7 +25,7 @@ class Condition extends ConditionBase {
   protected $query;
 
   /**
-   * Implements Drupal\Core\Entity\Query\ConditionInterface::compile().
+   * {@inheritdoc}
    */
   public function compile($conditionContainer) {
     // If this is not the top level condition group then the sql query is
@@ -50,14 +53,14 @@ public function compile($conditionContainer) {
   }
 
   /**
-   * Implements Drupal\Core\Entity\Query\ConditionInterface::exists().
+   * {@inheritdoc}
    */
   public function exists($field, $langcode = NULL) {
     return $this->condition($field, NULL, 'IS NOT NULL', $langcode);
   }
 
   /**
-   * Implements Drupal\Core\Entity\Query\ConditionInterface::notExists().
+   * {@inheritdoc}
    */
   public function notExists($field, $langcode = NULL) {
     return $this->condition($field, NULL, 'IS NULL', $langcode);