Merge branch 'release/4.1' into dev

frontend/app/work_packages/directives/inplace_editor/inplace-editor-display-pane-directive.js

@@ -92,10 +92,13 @@ module.exports = function(
         scope.displayPaneController.placeholder = I18n.t('js.label_click_to_enter_description');
       }
 
-      scope.$watch('fieldController.isEditing', function(isEditing) {
+      scope.$watch('fieldController.isEditing', function(isEditing, oldIsEditing) {
         if (!isEditing) {
           $timeout(function() {
+            if (oldIsEditing) {
+              // check old value to not trigger focus on the first time
               element.find('.inplace-editing--trigger-link').focus();
+            }
             element.find('.inplace-edit--read-value a').off('click').on('click', function(e) {
               e.stopPropagation();
             });

frontend/app/work_packages/filters/index.js

@@ -52,7 +52,7 @@ angular.module('openproject.workPackages.filters')
 .filter('remainingFilterNames', ['orderByFilter', 'FiltersHelper', function(orderByFilter, FiltersHelper) {
 
   function subtractActiveFilters(filters, filtersToSubtract) {
-    var filterDiff = angular.copy(filters);
+    var filterDiff = _.cloneDeep(filters);
 
     angular.forEach(filtersToSubtract, function(filter) {
       if(!filter.deactivated) delete filterDiff[filter.name];