diff --git a/src/Core/Asset/AbstractScript.php b/src/Core/Asset/AbstractScript.php
index 280f9108..ae19eee6 100644
--- a/src/Core/Asset/AbstractScript.php
+++ b/src/Core/Asset/AbstractScript.php
@@ -157,7 +157,7 @@ protected static function internalJS($content)
      *
      * @return  bool|string
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  3.3
      */
     protected static function exists($uri, $strict = false)
     {
@@ -202,7 +202,7 @@ public static function getJSObject(...$data)
      *
      * @return  string
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  3.4
      */
     public static function wrapFunction($body, $interface = '')
     {
diff --git a/src/Core/Asset/AssetManager.php b/src/Core/Asset/AssetManager.php
index 7008697b..f1e183b8 100644
--- a/src/Core/Asset/AssetManager.php
+++ b/src/Core/Asset/AssetManager.php
@@ -206,7 +206,9 @@ public function addScript($url, $options = [], $attribs = [])
      *
      * @return  AssetManager
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  3.3
+     *
+     * @deprecated  HTML imports has been deprecated.
      */
     public function import($url, array $options = [], array $attribs = [])
     {
@@ -257,7 +259,7 @@ public function internalScript($content)
      *
      * @return  bool|string
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  3.3
      */
     public function exists($uri, $strict = false)
     {
diff --git a/src/Core/Mvc/MvcResolver.php b/src/Core/Mvc/MvcResolver.php
index 5066c04c..84f743ea 100644
--- a/src/Core/Mvc/MvcResolver.php
+++ b/src/Core/Mvc/MvcResolver.php
@@ -94,8 +94,6 @@ public function resolveRepository($package, $name)
      *
      * @return  false|string
      *
-     * @since  __DEPLOY_VERSION__
-     *
      * @deprecated  Use resolveRepository() instead.
      */
     public function resolveModel($package, $name)
diff --git a/src/Core/Mvc/RepositoryResolver.php b/src/Core/Mvc/RepositoryResolver.php
index 44deedfa..f6f47dca 100644
--- a/src/Core/Mvc/RepositoryResolver.php
+++ b/src/Core/Mvc/RepositoryResolver.php
@@ -16,7 +16,7 @@
 /**
  * The RepositoryResolver class.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.4
  */
 class RepositoryResolver extends AbstractClassResolver
 {
diff --git a/src/Core/Renderer/Edge/EdgeHelper.php b/src/Core/Renderer/Edge/EdgeHelper.php
index ecb6b279..45fd4732 100644
--- a/src/Core/Renderer/Edge/EdgeHelper.php
+++ b/src/Core/Renderer/Edge/EdgeHelper.php
@@ -13,7 +13,7 @@
 /**
  * The EdgeHelper class.
  *
- * @since  __DEPLOY_VERSION__
+ * @since  3.3
  */
 class EdgeHelper
 {
@@ -25,7 +25,7 @@ class EdgeHelper
      *
      * @return  string
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  3.3
      */
     public static function attr($name, $value = null)
     {
diff --git a/src/Core/Renderer/Edge/WindwalkerExtension.php b/src/Core/Renderer/Edge/WindwalkerExtension.php
index 915c6391..c9c44340 100644
--- a/src/Core/Renderer/Edge/WindwalkerExtension.php
+++ b/src/Core/Renderer/Edge/WindwalkerExtension.php
@@ -270,7 +270,7 @@ public function formToken($expression)
      *
      * @return  string
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  3.3
      */
     public function attr($expression)
     {
@@ -283,6 +283,8 @@ public function attr($expression)
      * @param string $expression
      *
      * @return  string
+     *
+     * @since  3.3
      */
     public function shown($expression)
     {
@@ -295,6 +297,8 @@ public function shown($expression)
      * @param string $expression
      *
      * @return  string
+     *
+     * @since   3.3
      */
     public function dd($expression)
     {
@@ -307,6 +311,8 @@ public function dd($expression)
      * @param string $expression
      *
      * @return  string
+     *
+     * @since   3.3
      */
     public function dead($expression)
     {
@@ -319,6 +325,8 @@ public function dead($expression)
      * @param string $expression
      *
      * @return  string
+     *
+     * @since  3.3
      */
     public function debug($expression)
     {
diff --git a/src/Core/Utilities/helpers.php b/src/Core/Utilities/helpers.php
index 7ddb7345..9207c49a 100644
--- a/src/Core/Utilities/helpers.php
+++ b/src/Core/Utilities/helpers.php
@@ -93,7 +93,7 @@ function date_compare($date1, $date2, $operator = null) {
      *
      * @return  string
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  3.4
      */
     function html_escape($string, $nl2br = false, $doubleEncode = true) {
         $string = htmlspecialchars($string, ENT_QUOTES, 'UTF-8', $doubleEncode);
diff --git a/src/SystemPackage/Command/System/LangMergeCommand.php b/src/SystemPackage/Command/System/LangMergeCommand.php
index 6183a60e..b2e8ec31 100644
--- a/src/SystemPackage/Command/System/LangMergeCommand.php
+++ b/src/SystemPackage/Command/System/LangMergeCommand.php
@@ -145,7 +145,7 @@ protected function doExecute()
 
         $dest = $replace ? $toFile : WINDWALKER_TEMP . '/language/' . $to . '/' . $file;
 
-        File::write($dest, $data);
+        File::write($dest, rtrim($data) . "\n");
 
         $this->out()->out(sprintf('File created: <info>%s</info>', $dest));
 
diff --git a/src/SystemPackage/Command/System/MailTestCommand.php b/src/SystemPackage/Command/System/MailTestCommand.php
index dbe75731..33e3a85a 100644
--- a/src/SystemPackage/Command/System/MailTestCommand.php
+++ b/src/SystemPackage/Command/System/MailTestCommand.php
@@ -39,7 +39,7 @@ class MailTestCommand extends CoreCommand
      *
      * @return  void
      *
-     * @since  __DEPLOY_VERSION__
+     * @since  3.4
      */
     protected function init()
     {