diff --git a/css/webform.form.css b/css/webform.form.css
index 49e0b924..be082ddb 100644
--- a/css/webform.form.css
+++ b/css/webform.form.css
@@ -21,7 +21,7 @@
  * Make sure flexbox is always using 'display: flex' when toggled via #states.
  * @see https://stackoverflow.com/questions/38491653/jquery-show-a-flex-box/4121
  */
-.webform-flexbox.js-webform-states-hidden[style*='display: block']{
+.webform-flexbox.js-webform-states-hidden[style*='display: block'] {
   display: flex !important;
 }
 
@@ -41,7 +41,7 @@
 }
 
 /**
- * Element title inline.
+ * Element title inline.z
  */
 .webform-element--title-inline > label {
   display: inline;
diff --git a/docs/RELEASE-NOTES.md b/docs/RELEASE-NOTES.md
index eb81bf7d..c85e0592 100644
--- a/docs/RELEASE-NOTES.md
+++ b/docs/RELEASE-NOTES.md
@@ -176,7 +176,7 @@ References
 
 [Git Release Notes for Drush](https://www.drupal.org/project/grn)
 
-    drush release-notes --nouser 8.x-5.0-rc1 8.x-5.x
+    drush release-notes --nouser 8.x-5.3-beta3 8.x-5.x
 
 
 6. Tag and create a new release
diff --git a/includes/webform.install.update.inc b/includes/webform.install.update.inc
index 88d9d75d..264f2b17 100644
--- a/includes/webform.install.update.inc
+++ b/includes/webform.install.update.inc
@@ -3111,4 +3111,3 @@ function webform_update_8167() {
     ->clear('contribute')
     ->save();
 }
-
diff --git a/modules/webform_access/src/WebformAccessGroupInterface.php b/modules/webform_access/src/WebformAccessGroupInterface.php
index ebaa0ab0..64f7dd22 100644
--- a/modules/webform_access/src/WebformAccessGroupInterface.php
+++ b/modules/webform_access/src/WebformAccessGroupInterface.php
@@ -171,12 +171,11 @@ interface WebformAccessGroupInterface extends ConfigEntityInterface {
    */
   public function removeEntityId($entity_type, $entity_id, $field_name, $webform_id);
 
-
   /**
    * Add email address to webform access group.
    *
    * @param string $email
-   *   An email address
+   *   An email address.
    *
    * @return $this
    */
diff --git a/modules/webform_entity_print/webform_entity_print.module b/modules/webform_entity_print/webform_entity_print.module
index 08c2edf9..3d7c0e82 100644
--- a/modules/webform_entity_print/webform_entity_print.module
+++ b/modules/webform_entity_print/webform_entity_print.module
@@ -9,7 +9,6 @@ use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Url;
-use Drupal\webform\Entity\Webform;
 use Drupal\webform\WebformSubmissionInterface;
 use Drupal\Core\Render\Markup;
 
@@ -186,7 +185,7 @@ function webform_entity_print_preprocess_entity_print(array &$variables) {
   $css = [];
 
   // Add webform CSS.
-  $assets = $webform ->getAssets();
+  $assets = $webform->getAssets();
   if ($assets['css']) {
     $css[] = $assets['css'];
   }
diff --git a/modules/webform_node/tests/src/Functional/WebformNodeBrowserTestBase.php b/modules/webform_node/tests/src/Functional/WebformNodeBrowserTestBase.php
index b6002f10..c90d9e76 100644
--- a/modules/webform_node/tests/src/Functional/WebformNodeBrowserTestBase.php
+++ b/modules/webform_node/tests/src/Functional/WebformNodeBrowserTestBase.php
@@ -68,7 +68,7 @@ abstract class WebformNodeBrowserTestBase extends WebformBrowserTestBase {
 
     $webform = $entity_reference_manager->getWebform($node);
     $submit = $this->getWebformSubmitButtonLabel($webform, $submit);
-    $this->drupalPostForm('node/' . $node->id() .'/webform/test', $edit, $submit, $options);
+    $this->drupalPostForm('node/' . $node->id() . '/webform/test', $edit, $submit, $options);
     return $this->getLastSubmissionId($webform);
   }
 
diff --git a/src/Controller/WebformAddonsController.php b/src/Controller/WebformAddonsController.php
index e3b442e4..04a5267f 100644
--- a/src/Controller/WebformAddonsController.php
+++ b/src/Controller/WebformAddonsController.php
@@ -118,7 +118,7 @@ class WebformAddonsController extends ControllerBase implements ContainerInjecti
       $projects = $this->addons->getProjects($category_name);
       foreach ($projects as $project_name => &$project) {
         if (isset($project['logo'])) {
-          $project['title'] = Markup::create('<img src="' . $project['logo']->toString() . '" alt="' . $project['title' ]. '"/>' . $project['title']);
+          $project['title'] = Markup::create('<img src="' . $project['logo']->toString() . '" alt="' . $project['title'] . '"/>' . $project['title']);
         }
         $project['description'] .= '<br /><small>' . $project['url']->toString() . '</small>';
 
diff --git a/src/Form/AdminConfig/WebformAdminConfigFormsForm.php b/src/Form/AdminConfig/WebformAdminConfigFormsForm.php
index 0887ad96..5ea5ac09 100644
--- a/src/Form/AdminConfig/WebformAdminConfigFormsForm.php
+++ b/src/Form/AdminConfig/WebformAdminConfigFormsForm.php
@@ -440,7 +440,7 @@ class WebformAdminConfigFormsForm extends WebformAdminConfigBaseForm {
       ],
       '#states' => [
         'visible' => [
-          ':input[name="ajax_settings[default_ajax_effect]"]' => ['!value' => 'none']
+          ':input[name="ajax_settings[default_ajax_effect]"]' => ['!value' => 'none'],
         ],
       ],
       '#default_value' => $settings['default_ajax_speed'],
diff --git a/src/Form/WebformHelpVideoForm.php b/src/Form/WebformHelpVideoForm.php
index 802051da..2e1ce1f8 100644
--- a/src/Form/WebformHelpVideoForm.php
+++ b/src/Form/WebformHelpVideoForm.php
@@ -126,7 +126,6 @@ class WebformHelpVideoForm extends FormBase {
     return $form;
   }
 
-
   /**
    * {@inheritdoc}
    */
diff --git a/src/Plugin/WebformElement/Select.php b/src/Plugin/WebformElement/Select.php
index 18b3d6fc..1c5c25f6 100644
--- a/src/Plugin/WebformElement/Select.php
+++ b/src/Plugin/WebformElement/Select.php
@@ -228,7 +228,7 @@ class Select extends OptionsBase {
     $form['form']['size_container']['#states'] = [
       'visible' => [
         ':input[name="properties[multiple][container][cardinality_number]"]' => ['!value' => 1],
-      ]
+      ],
     ];
 
     return $form;
diff --git a/src/Plugin/WebformElement/TextFormat.php b/src/Plugin/WebformElement/TextFormat.php
index eb738379..90ad0542 100644
--- a/src/Plugin/WebformElement/TextFormat.php
+++ b/src/Plugin/WebformElement/TextFormat.php
@@ -104,7 +104,7 @@ class TextFormat extends WebformElementBase {
     return $element;
   }
 
-   /**
+  /**
    * Set an elements #states and flexbox wrapper.
    *
    * @param array $element
@@ -142,7 +142,7 @@ class TextFormat extends WebformElementBase {
     }
     return $element;
   }
-  
+
   /**
    * {@inheritdoc}
    */
diff --git a/src/Tests/WebformRenderingTest.php b/src/Tests/WebformRenderingTest.php
index 94b75dde..1e6e31ed 100644
--- a/src/Tests/WebformRenderingTest.php
+++ b/src/Tests/WebformRenderingTest.php
@@ -80,25 +80,22 @@ class WebformRenderingTest extends WebformTestBase {
 
     // Check HTML email.
     $this->assertEqual($html_email['subject'], 'submission label (&>');
-
     $this->assertEqual($html_email['params']['subject'], 'submission <em>label</em> (&><#)');
-    // Below tests are failing on Drupal.org but passing on localhost.
-    // $this->assertContains($html_email['params']['body'], '<b>submission_label</b><br />submission &lt;em&gt;label&lt;/em&gt; (&amp;&gt;&lt;#)<br /><br />');
-    // $this->assertContains($html_email['params']['body'], '<b>textfield_plain_text</b><br />{prefix}{default_value}{suffix}<br /><br />');
-    // $this->assertContains($html_email['params']['body'], '<b><em>textfield_markup</em></b><br /><em>{prefix}</em>{default_value}<em>{suffix}</em><br /><br />');
-    // $this->assertContains($html_email['params']['body'], '<b>textfield_special_characters (&amp;&gt;&lt;#)</b><br />(&amp;&gt;&lt;#){default_value}(&amp;&gt;&lt;#)<br /><br />');
-    // $this->assertContains($html_email['params']['body'], '<b>text_format_basic_html</b><br /><p><em>{default_value}</em></p><br /><br />');
+    $this->assertContains('<b>submission_label</b><br />submission &lt;em&gt;label&lt;/em&gt; (&amp;&gt;&lt;#)<br /><br />', $html_email['params']['body']);
+    $this->assertContains('<b>textfield_plain_text</b><br />{prefix}{default_value}{suffix}<br /><br />', $html_email['params']['body']);
+    $this->assertContains('<b><em>textfield_markup</em></b><br /><em>{prefix}</em>{default_value}<em>{suffix}</em><br /><br />', $html_email['params']['body']);
+    $this->assertContains('<b>textfield_special_characters (&amp;&gt;&lt;#)</b><br />(&amp;&gt;&lt;#){default_value}(&amp;&gt;&lt;#)<br /><br />', $html_email['params']['body']);
+    $this->assertContains('<b>text_format_basic_html</b><br /><p><em>{default_value}</em></p><br /><br />', $html_email['params']['body']);
 
     // Check plain text email.
     $this->assertEqual($text_email['subject'], 'submission label (&>');
     $this->assertEqual($text_email['params']['subject'], 'submission <em>label</em> (&><#)');
-    // Below tests are failing on Drupal.org but passing on localhost.
-    // $this->assertContains($text_email['params']['body'], 'submission_label: submission &lt;em&gt;label&lt;/em&gt; (&amp;&gt;&lt;#)');
-    // $this->assertContains($text_email['params']['body'], 'textfield_plain_text: {prefix}{default_value}{suffix}');
-    // $this->assertContains($text_email['params']['body'], 'textfield_markup: <em>{prefix}</em>{default_value}<em>{suffix}</em>');
-    // $this->assertContains($text_email['params']['body'], 'textfield_special_characters (&amp;&gt;: (&amp;&gt;&lt;#){default_value}(&amp;&gt;&lt;#)');
-    // $this->assertContains($text_email['params']['body'], 'text_format_basic_html:');
-    // $this->assertContains($text_email['params']['body'], '/{default_value}/');
+    $this->assertContains('submission_label: submission <em>label</em> (&><#)', $text_email['params']['body']);
+    $this->assertContains('textfield_plain_text: {prefix}{default_value}{suffix}', $text_email['params']['body']);
+    $this->assertContains('textfield_markup: {prefix}{default_value}{suffix}', $text_email['params']['body']);
+    $this->assertContains('textfield_special_characters (&>: (&>{default_value}(&>', $text_email['params']['body']);
+    $this->assertContains('text_format_basic_html:', $text_email['params']['body']);
+    $this->assertContains('/{default_value}/', $text_email['params']['body']);
 
     /**************************************************************************/
     // Submission.
diff --git a/src/Twig/TwigExtension.php b/src/Twig/TwigExtension.php
index 41c8362e..ee8b5dce 100644
--- a/src/Twig/TwigExtension.php
+++ b/src/Twig/TwigExtension.php
@@ -8,4 +8,6 @@ namespace Drupal\webform\Twig;
  * @deprecated as of Webform 8.x-5.x, will be removed in Webform 8.x-6.x.
  *   Instead extend and use WebformTwigExtension.
  */
-class TwigExtension extends WebformTwigExtension { }
+class TwigExtension extends WebformTwigExtension {
+
+}
diff --git a/src/Utility/WebformElementHelper.php b/src/Utility/WebformElementHelper.php
index a050b1b7..62dd36e4 100644
--- a/src/Utility/WebformElementHelper.php
+++ b/src/Utility/WebformElementHelper.php
@@ -175,8 +175,8 @@ class WebformElementHelper {
    * @return bool
    *   TRUE if element or sub-element has any property.
    */
-  public static function hasProperties(array $elements, array $properties) {
-    foreach ($elements as $key => $value) {
+  public static function hasProperties(array $element, array $properties) {
+    foreach ($element as $key => $value) {
       // Recurse through sub-elements.
       if (static::isElement($value, $key)) {
         if (static::hasProperties($value, $properties)) {
diff --git a/src/WebformAddonsManager.php b/src/WebformAddonsManager.php
index eb7da54a..36ce8681 100644
--- a/src/WebformAddonsManager.php
+++ b/src/WebformAddonsManager.php
@@ -624,7 +624,6 @@ class WebformAddonsManager implements WebformAddonsManagerInterface {
       'category' => 'mail',
     ];
 
-
     /**************************************************************************/
     // Multilingual.
     /**************************************************************************/
diff --git a/src/WebformEntityExportForm.php b/src/WebformEntityExportForm.php
index 04ef7f7f..e842615c 100644
--- a/src/WebformEntityExportForm.php
+++ b/src/WebformEntityExportForm.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\webform;
 
-use Drupal\Core\Serialization\Yaml;
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\webform\Utility\WebformYaml;
diff --git a/src/WebformHelpManagerInterface.php b/src/WebformHelpManagerInterface.php
index 4c3bc9d2..059a69d3 100644
--- a/src/WebformHelpManagerInterface.php
+++ b/src/WebformHelpManagerInterface.php
@@ -141,6 +141,8 @@ interface WebformHelpManagerInterface {
    *
    * @param string $video_id
    *   Video id.
+   * @param string|null $video_display
+   *   Video displa type.
    * @param string|null $title
    *   Link title.
    * @param array $options
@@ -149,7 +151,7 @@ interface WebformHelpManagerInterface {
    * @return array
    *   A renderable array containing a link to a video.
    */
-  public function buildVideoLink($video_id, $title = NULL, $more = FALSE, array $options = []);
+  public function buildVideoLink($video_id, $video_display = NULL, $title = NULL, array $options = []);
 
   /**
    * Build the add-ons section.
diff --git a/tests/modules/webform_test/config/install/webform.webform.test_rendering.yml b/tests/modules/webform_test/config/install/webform.webform.test_rendering.yml
index 7d4d4aca..77befb99 100644
--- a/tests/modules/webform_test/config/install/webform.webform.test_rendering.yml
+++ b/tests/modules/webform_test/config/install/webform.webform.test_rendering.yml
@@ -49,7 +49,7 @@ elements: |
     '#default_value':
       value: '<p><em>{default_value}</em></p>'
       format: basic_html
-  
+
 css: ''
 javascript: ''
 settings:
@@ -249,7 +249,7 @@ handlers:
     handler_id: email_text
     status: true
     conditions: {  }
-    weight: 0
+    weight: 1
     settings:
       states:
         - completed
diff --git a/tests/src/Unit/Utility/WebformElementHelperTest.php b/tests/src/Unit/Utility/WebformElementHelperTest.php
index 62060fa5..f1fe3f6c 100644
--- a/tests/src/Unit/Utility/WebformElementHelperTest.php
+++ b/tests/src/Unit/Utility/WebformElementHelperTest.php
@@ -179,7 +179,7 @@ class WebformElementHelperTest extends UnitTestCase {
    *
    * @param array $elements
    *   The array to run through WebformElementHelper::convertRenderMarkupToStrings().
-   * @param boolean $expected
+   * @param bool $expected
    *   The expected result from calling the function.
    *
    * @see WebformElementHelper::HasProperty()