diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
index 26c77c1a6d..f39ac19fa3 100644
--- a/protected/humhub/docs/CHANGELOG.md
+++ b/protected/humhub/docs/CHANGELOG.md
@@ -6,6 +6,7 @@ HumHub Change Log
 - Enh: Added HomeUrl support to ConsoleApplication
 - Fix: #2536 Incorrect log of "Attempt to steal file" due to faulty File::isAssignedTo() check
 - Fix: Wrong help block position in admin basic settings
+- Chng: Removed yiisoft/yii2-apidoc dependency
 
 
 1.3.12  (March 26, 2019)
diff --git a/protected/humhub/modules/content/models/Content.php b/protected/humhub/modules/content/models/Content.php
index 43f621c231..4961e5d32a 100644
--- a/protected/humhub/modules/content/models/Content.php
+++ b/protected/humhub/modules/content/models/Content.php
@@ -216,6 +216,7 @@ class Content extends ContentDeprecated implements Movable, ContentOwner
 
     /**
      * @return bool checks if the given content allows content creation notifications and activities
+     * @throws IntegrityException
      */
     private function isMuted()
     {
diff --git a/protected/humhub/modules/stream/resources/js/humhub.stream.StreamRequest.js b/protected/humhub/modules/stream/resources/js/humhub.stream.StreamRequest.js
index 34c35a7480..99c375e5ef 100644
--- a/protected/humhub/modules/stream/resources/js/humhub.stream.StreamRequest.js
+++ b/protected/humhub/modules/stream/resources/js/humhub.stream.StreamRequest.js
@@ -116,7 +116,7 @@ humhub.module('stream.StreamRequest', function (module, require, $) {
         if(this.options.data) {
             $.each(this.options.data, function(key, value) {
                 data[this.buildRequestDataKey(key)] = value;
-            })
+            });
         }
 
         $.each(this.stream.filter.getFilterMap(), function(key, value) {
diff --git a/protected/humhub/modules/stream/tests/codeception/acceptance/StreamCest.php b/protected/humhub/modules/stream/tests/codeception/acceptance/StreamCest.php
index 355ad981b8..d48fec0067 100644
--- a/protected/humhub/modules/stream/tests/codeception/acceptance/StreamCest.php
+++ b/protected/humhub/modules/stream/tests/codeception/acceptance/StreamCest.php
@@ -7,6 +7,7 @@
 
 namespace stream\acceptance;
 
+use humhub\modules\content\models\Content;
 use stream\AcceptanceTester;
 
 class StreamCest
@@ -56,6 +57,7 @@ class StreamCest
 
         $newEntrySelector = '[data-content-key="14"]';
 
+
         $I->waitForElementVisible($newEntrySelector);
         $I->see('This is my stream test post', '.wall-entry');
 
diff --git a/protected/humhub/modules/user/widgets/UserPickerField.php b/protected/humhub/modules/user/widgets/UserPickerField.php
index c0188b4ea5..96cb39f97c 100644
--- a/protected/humhub/modules/user/widgets/UserPickerField.php
+++ b/protected/humhub/modules/user/widgets/UserPickerField.php
@@ -3,7 +3,7 @@
 namespace humhub\modules\user\widgets;
 
 use humhub\modules\user\models\User;
-use humhub\widgets\BasePickerField;
+use humhub\modules\ui\form\widgets\BasePicker;
 use Yii;
 use yii\helpers\Html;
 use yii\helpers\Url;
@@ -14,7 +14,7 @@ use yii\helpers\Url;
  * @since 1.2
  * @author buddha
  */
-class UserPickerField extends BasePickerField
+class UserPickerField extends BasePicker
 {
     /**
      * @inheritdoc
@@ -41,6 +41,7 @@ class UserPickerField extends BasePickerField
         if (empty($this->itemKey)) {
             $this->itemKey = 'guid';
         }
+        parent::init();
     }
 
     /**