diff --git a/Gemfile b/Gemfile
index 5dd03e203..08e6892e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,7 +73,7 @@ gem 'i18n-js', '~> 3.6' # Localization in javascript files
 gem 'jbuilder' # JSON structures via a Builder-style DSL
 gem 'logging', '~> 2.0.0'
 gem 'nested_form_fields'
-gem 'nokogiri', '~> 1.13.6' # HTML/XML parser
+gem 'nokogiri', '~> 1.13.9' # HTML/XML parser
 gem 'rails_autolink', '~> 1.1', '>= 1.1.6'
 gem 'rgl' # Graph framework for project diagram calculations
 gem 'roo', '~> 2.8.2' # Spreadsheet parser
diff --git a/Gemfile.lock b/Gemfile.lock
index 545590dca..b765363c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -384,7 +384,7 @@ GEM
       rails (>= 3.2.0)
     newrelic_rpm (6.15.0)
     nio4r (2.5.8)
-    nokogiri (1.13.7)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth2 (1.4.4)
@@ -689,7 +689,7 @@ DEPENDENCIES
   momentjs-rails (~> 2.17.1)
   nested_form_fields
   newrelic_rpm
-  nokogiri (~> 1.13.6)
+  nokogiri (~> 1.13.9)
   omniauth
   omniauth-azure-activedirectory
   omniauth-linkedin-oauth2
diff --git a/VERSION b/VERSION
index ac6015b64..dd43a143f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.26.0.5
+1.26.1
diff --git a/app/assets/stylesheets/settings/label_printers.scss b/app/assets/stylesheets/settings/label_printers.scss
index 3cdfaf0fb..733c55ae6 100644
--- a/app/assets/stylesheets/settings/label_printers.scss
+++ b/app/assets/stylesheets/settings/label_printers.scss
@@ -34,6 +34,18 @@
     }
   }
 
+  ol {
+    padding-left: 0;
+
+    li {
+      padding: .5em 0;
+    }
+
+    .indented_row {
+      padding-left: 4px;
+    }
+  }
+
   .zebra-settings-collapse {
     border-left: 3px solid $color-concrete;
     margin-top: 14px;
@@ -42,6 +54,10 @@
 
     .collapse {
       padding-left: 2.5em;
+
+      ol {
+        padding-left: 1.5em;
+      }
     }
 
     .collapse-row {
@@ -99,6 +115,7 @@
   .row-title {
     @include font-h2;
     margin-left: .5em;
+    margin-top: .25em;
   }
 
   .api-key-container {
diff --git a/app/controllers/label_templates_controller.rb b/app/controllers/label_templates_controller.rb
index 547691d1e..a1d235a94 100644
--- a/app/controllers/label_templates_controller.rb
+++ b/app/controllers/label_templates_controller.rb
@@ -130,7 +130,9 @@ class LabelTemplatesController < ApplicationController
 
   def zpl_preview
     service = LabelTemplatesPreviewService.new(params, current_user)
-    payload = service.generate_zpl_preview!
+
+    # only render last generated label image
+    payload = service.generate_zpl_preview!.split.last
 
     if service.error.blank?
       render json: { base64_preview: payload }
diff --git a/app/javascript/vue/label_template/components/label_preview.vue b/app/javascript/vue/label_template/components/label_preview.vue
index 4d6112380..4e51c41d3 100644
--- a/app/javascript/vue/label_template/components/label_preview.vue
+++ b/app/javascript/vue/label_template/components/label_preview.vue
@@ -101,7 +101,7 @@
         DPMM_RESOLUTION_OPTIONS,
         DPI_RESOLUTION_OPTIONS,
         optionsOpen: false,
-        width: this.template.attributes.unit == 'in' ? this.template.attributes.width_mm / 25.4 : this.template.attributes.width_mm ,
+        width: this.template.attributes.unit == 'in' ? this.template.attributes.width_mm / 25.4 : this.template.attributes.width_mm,
         height: this.template.attributes.unit == 'in' ? this.template.attributes.height_mm / 25.4 : this.template.attributes.height_mm,
         unit: this.template.attributes.unit,
         density: this.template.attributes.density,
@@ -125,19 +125,16 @@
     },
     watch: {
       unit() {
-        this.recalculateUnits();
         this.setDefaults();
       },
       zpl() {
         this.refreshPreview();
       },
       template() {
+        this.unit = this.template.attributes.unit
         this.width = this.template.attributes.unit == 'in' ? this.template.attributes.width_mm / 25.4 : this.template.attributes.width_mm
         this.height = this.template.attributes.unit == 'in' ? this.template.attributes.height_mm / 25.4 : this.template.attributes.height_mm
-        this.unit = this.template.attributes.unit
         this.density = this.template.attributes.density
-
-        this.refreshPreview()
       }
     },
     methods: {
@@ -159,6 +156,8 @@
       refreshPreview() {
         if (this.zpl.length === 0) return;
 
+        this.base64Image = null;
+
         $.ajax({
           url: this.previewUrl,
           type: 'GET',
@@ -184,7 +183,9 @@
         });
       },
       updateUnit(unit) {
+        if (this.unit === unit) return;
         this.unit = unit;
+        this.recalculateUnits();
         this.$emit('unit:update', this.unit);
       },
       updateDensity(density) {
diff --git a/app/javascript/vue/repository_print_modal/container.vue b/app/javascript/vue/repository_print_modal/container.vue
index 47d273b85..57dfb279d 100644
--- a/app/javascript/vue/repository_print_modal/container.vue
+++ b/app/javascript/vue/repository_print_modal/container.vue
@@ -2,7 +2,7 @@
   <div ref="modal" class="modal fade" id="modal-print-repository-row-label" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-dialog" role="document">
       <div class="modal-content">
-        <div v-if="printers_dropdown.length > 0" class="printers-available">
+        <div v-if="availablePrinters.length > 0" class="printers-available">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             <p class="modal-title">
@@ -24,7 +24,7 @@
               </label>
               <DropdownSelector
                 :disableSearch="true"
-                :options="printers_dropdown"
+                :options="availablePrinters"
                 :selectorId="`LabelPrinterSelector`"
                 @dropdown:changed="selectPrinter"
               />
@@ -38,7 +38,7 @@
               <DropdownSelector
                 ref="labelTemplateDropdown"
                 :disableSearch="true"
-                :options="templates_dropdown"
+                :options="availableTemplates"
                 :selectorId="`LabelTemplateSelector`"
                 :optionLabel="templateOption"
                 :onOpen="initTooltip"
@@ -138,7 +138,7 @@
       }
     },
     computed: {
-      templates_dropdown() {
+      availableTemplates() {
         let templates = this.templates;
         if (this.selectedPrinter && this.selectedPrinter.attributes.type_of === 'zebra') {
           templates = templates.filter(i => i.attributes.type === 'ZebraLabelTemplate')
@@ -155,7 +155,7 @@
           }
         })
       },
-      printers_dropdown() {
+      availablePrinters() {
         return this.printers.map(i => {
           return {
             value: i.id,
diff --git a/app/jobs/user_assignments/remove_team_user_assignments_job.rb b/app/jobs/user_assignments/remove_team_user_assignments_job.rb
index 8aee0a70a..582d6598d 100644
--- a/app/jobs/user_assignments/remove_team_user_assignments_job.rb
+++ b/app/jobs/user_assignments/remove_team_user_assignments_job.rb
@@ -4,9 +4,9 @@ module UserAssignments
   class RemoveTeamUserAssignmentsJob < ApplicationJob
     queue_as :high_priority
 
-    def perform(user, team)
+    def perform(team_user_assignment)
       ActiveRecord::Base.transaction do
-        RemoveTeamUserAssignmentsService.new(user, team).call
+        RemoveTeamUserAssignmentsService.new(team_user_assignment).call
       end
     end
   end
diff --git a/app/jobs/user_assignments/update_team_user_assignments_job.rb b/app/jobs/user_assignments/update_team_user_assignments_job.rb
index 3c5c0dcb3..431a033b6 100644
--- a/app/jobs/user_assignments/update_team_user_assignments_job.rb
+++ b/app/jobs/user_assignments/update_team_user_assignments_job.rb
@@ -4,9 +4,9 @@ module UserAssignments
   class UpdateTeamUserAssignmentsJob < ApplicationJob
     queue_as :high_priority
 
-    def perform(user, team, user_role)
+    def perform(team_user_assignment)
       ActiveRecord::Base.transaction do
-        UpdateTeamUserAssignmentsService.new(user, team, user_role).call
+        UpdateTeamUserAssignmentsService.new(team_user_assignment).call
       end
     end
   end
diff --git a/app/models/label_printer.rb b/app/models/label_printer.rb
index 291b82b9e..fbfe6e1ce 100644
--- a/app/models/label_printer.rb
+++ b/app/models/label_printer.rb
@@ -19,6 +19,10 @@ class LabelPrinter < ApplicationRecord
   validates :type_of, presence: true
   validates :language_type, presence: true
 
+  def self.zebra_print_enabled?
+    RepositoryBase.stock_management_enabled?
+  end
+
   def done?
     current_print_job_ids.blank? && ready?
   end
diff --git a/app/models/label_template.rb b/app/models/label_template.rb
index 52f5ca61b..667c4ab36 100644
--- a/app/models/label_template.rb
+++ b/app/models/label_template.rb
@@ -16,7 +16,7 @@ class LabelTemplate < ApplicationRecord
   validate :ensure_single_default_template!
 
   def self.enabled?
-    ApplicationSettings.instance.values['label_templates_enabled']
+    RepositoryBase.stock_management_enabled?
   end
 
   def icon
diff --git a/app/models/step_text.rb b/app/models/step_text.rb
index af0bea5a2..15c19b5ff 100644
--- a/app/models/step_text.rb
+++ b/app/models/step_text.rb
@@ -5,7 +5,11 @@ class StepText < ApplicationRecord
   include ActionView::Helpers::TextHelper
 
   auto_strip_attributes :text, nullify: false
-  validates :text, length: { maximum: Constants::RICH_TEXT_MAX_LENGTH }
+  validates :text, length:
+    {
+      maximum:
+       ENV['STEP_TEXT_MAX_LENGTH'].present? ? ENV['STEP_TEXT_MAX_LENGTH'].to_i : Constants::RICH_TEXT_MAX_LENGTH
+    }
 
   belongs_to :step, inverse_of: :step_texts, touch: true
   has_one :step_orderable_element, as: :orderable, dependent: :destroy
diff --git a/app/permissions/repository.rb b/app/permissions/repository.rb
index 356ba5f7a..e50857783 100644
--- a/app/permissions/repository.rb
+++ b/app/permissions/repository.rb
@@ -30,7 +30,7 @@ Canaid::Permissions.register_for(Repository) do
      delete_repository_rows)
     .each do |perm|
     can perm do |user, repository|
-      next false if repository.shared_with?(user.current_team) && !repository.shared_with_write?(user.current_team)
+      repository.shared_with?(user.current_team) ? repository.shared_with_write?(user.current_team) : true
     end
   end
 
diff --git a/app/services/user_assignments/update_team_user_assignments_service.rb b/app/services/user_assignments/update_team_user_assignments_service.rb
index 631110707..92309177d 100644
--- a/app/services/user_assignments/update_team_user_assignments_service.rb
+++ b/app/services/user_assignments/update_team_user_assignments_service.rb
@@ -5,7 +5,7 @@ module UserAssignments
     def initialize(team_user_assignment)
       @user = team_user_assignment.user
       @team = team_user_assignment.assignable
-      @user_role = user_role
+      @user_role = team_user_assignment.user_role
     end
 
     def call
@@ -25,6 +25,9 @@ module UserAssignments
                   .select { |assignment| assignment[:user_id] == @user.id && assignment[:team_id] == @team.id }
                   .each { |assignment| assignment.update!(user_role: @user_role) }
       end
+      @team.repository_sharing_user_assignments.where(user: @user).find_each do |assignment|
+        assignment.update!(user_role: @user_role)
+      end
     end
 
     def update_reports_assignments
diff --git a/app/views/access_permissions/experiments/modals/_show_modal.html.erb b/app/views/access_permissions/experiments/modals/_show_modal.html.erb
index ad440f7a7..60fffcd26 100644
--- a/app/views/access_permissions/experiments/modals/_show_modal.html.erb
+++ b/app/views/access_permissions/experiments/modals/_show_modal.html.erb
@@ -10,6 +10,7 @@
       <div class="modal-body">
         <% users.order(full_name: :asc).each do |user| %>
           <% user_assignment = experiment.user_assignments.find_by(user: user) %>
+          <% next if user_assignment.blank? %>
           <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: experiment } %>
         <% end %>
         <%= render('access_permissions/partials/default_public_user_role_form', project: experiment.project, editable: false) if experiment.project.visible? %>
diff --git a/app/views/access_permissions/my_modules/modals/_show_modal.html.erb b/app/views/access_permissions/my_modules/modals/_show_modal.html.erb
index 686086a3d..fc30944f7 100644
--- a/app/views/access_permissions/my_modules/modals/_show_modal.html.erb
+++ b/app/views/access_permissions/my_modules/modals/_show_modal.html.erb
@@ -10,6 +10,7 @@
       <div class="modal-body">
         <% users.order(full_name: :asc).each do |user| %>
           <% user_assignment = my_module.user_assignments.find_by(user: user) %>
+          <% next if user_assignment.blank? %>
           <%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: my_module } %>
         <% end %>
         <%= render('access_permissions/partials/default_public_user_role_form',
diff --git a/app/views/access_permissions/partials/_default_public_user_role_form.html.erb b/app/views/access_permissions/partials/_default_public_user_role_form.html.erb
index 3c57057b1..1e13d77b8 100644
--- a/app/views/access_permissions/partials/_default_public_user_role_form.html.erb
+++ b/app/views/access_permissions/partials/_default_public_user_role_form.html.erb
@@ -4,11 +4,11 @@
       <%= image_tag "icon/team.png", class: 'img-circle pull-left' %>
     </div>
     <div>
-      <%= t('access_permissions.everyone_else', team_name: f.object.team.name) %>
-      <%= render 'access_permissions/partials/public_members_dropdown', team: f.object.team, project: project %>
+      <%= t('access_permissions.everyone_else', team_name: project.team.name) %>
+      <%= render 'access_permissions/partials/public_members_dropdown', team: project.team, project: project %>
       <br>
       <small class="text-muted">
-        <%= f.object.default_public_user_role.name %>
+        <%= project.default_public_user_role.name %>
         <span class="permission-object-tag" title="<%= t("access_permissions.partials.project_tooltip") %>"">
           <%= t("access_permissions.partials.project") %>
         </span>
@@ -18,7 +18,7 @@
   <div class="user-assignment-controls">
     <div class="user-assignment-role">
       <% if editable %>
-        <%= f.select :default_public_user_role_id, options_for_select(user_roles_collection, selected: f.object.default_public_user_role_id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
+        <%= f.select :default_public_user_role_id, options_for_select(user_roles_collection, selected: project.default_public_user_role_id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
       <% end %>
     </div>
     <div class="user-assignment-remove">
diff --git a/app/views/label_printers/_label_printer_modal.html.erb b/app/views/label_printers/_label_printer_modal.html.erb
index 7ef58851f..9fca3cb10 100644
--- a/app/views/label_printers/_label_printer_modal.html.erb
+++ b/app/views/label_printers/_label_printer_modal.html.erb
@@ -7,7 +7,7 @@
   data-print-validation-url="<%= validate_label_template_columns_repository_row_path %>"
   data-label-preview-url="<%= zpl_preview_label_templates_path %>"
   data-fluics-info-url="<%= Constants::SCINOTE_FLUICS_URL %>"
-  data-zebra-enabled="<%= Rails.configuration.x.zebra_print_enabled %>"
+  data-zebra-enabled="<%= LabelPrinter.zebra_print_enabled? %>"
 >
   <print-modal-container
     :show-modal = "showModal"
diff --git a/app/views/label_printers/_zebra_settings.html.erb b/app/views/label_printers/_zebra_settings.html.erb
index cd549dc7f..b2fe1520a 100644
--- a/app/views/label_printers/_zebra_settings.html.erb
+++ b/app/views/label_printers/_zebra_settings.html.erb
@@ -1,24 +1,63 @@
 <ul>
   <li class="zebra-settings-collapse">
     <div class="collapse-row">
-      <i class="fas fa-caret-down" data-toggle="collapse" href="#InstructionsSection" aria-expanded="false"></i>
+      <i class="fas fa-caret-down collapsed" data-toggle="collapse" href="#InstructionsSection" aria-expanded="false"></i>
       <div class="row-title"><%= t("users.settings.account.label_printer.instructions") %></div>
     </div>
-    <ul class="collapse in" id="InstructionsSection">
+    <ul class="collapse" id="InstructionsSection">
       <li>
-        <%= t("users.settings.account.label_printer.zebra_instruction.p1") %>
-      </li>
-      <li class='indented_row'>
-        <%= t("users.settings.account.label_printer.zebra_instruction.p2_html", link: Constants::SCINOTE_ZEBRA_URL) %>
-      </li>
-      <li class='indented_row'>
-        <%= t("users.settings.account.label_printer.zebra_instruction.p3") %>
-      </li>
-      <li class='indented_row'>
-        <%= t("users.settings.account.label_printer.zebra_instruction.p4") %>
+        <%= t("users.settings.account.label_printer.zebra_instruction.general_html", link: Constants::SCINOTE_ZEBRA_DOWNLOAD_URL) %>
       </li>
+      <h3><%= t("users.settings.account.label_printer.zebra_instruction.usb.header") %></h3>
+      <ol>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.usb.p1") %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.usb.p2_html", link: Constants::SCINOTE_ZEBRA_DOWNLOAD_URL) %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.usb.p3") %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.usb.p4") %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.usb.p5") %>
+        </li>
+      </ol>
+      <h3><%= t("users.settings.account.label_printer.zebra_instruction.network.header") %></h3>
       <li>
-        <%= t("users.settings.account.label_printer.zebra_instruction.p5") %>
+        <%= t("users.settings.account.label_printer.zebra_instruction.network.disclaimer") %>
+      </li>
+      <ol>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.network.p1") %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.network.p2") %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.network.p3_html", link: Constants::SCINOTE_ZEBRA_DOWNLOAD_URL) %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.network.p4") %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.network.p5") %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.network.p6") %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.network.p7") %>
+        </li>
+        <li>
+          <%= t("users.settings.account.label_printer.zebra_instruction.network.p8") %>
+        </li>
+      </ol>
+      <li>
+        <%= t("users.settings.account.label_printer.zebra_instruction.contact_html", {link_blog: Constants::SCINOTE_ZEBRA_BLOG_URL, link_zebra_support: Constants::SCINOTE_ZEBRA_SUPPORT_URL}) %>
       </li>
     </ul>
   </li>
diff --git a/app/views/label_printers/index.html.erb b/app/views/label_printers/index.html.erb
index 1eec1fcd7..2c0d21bbd 100644
--- a/app/views/label_printers/index.html.erb
+++ b/app/views/label_printers/index.html.erb
@@ -16,7 +16,7 @@
       <h1 class="printer-title">
         <% if @printer_type == 'fluics' %>
           <%= t("users.settings.account.label_printer.fluics_printer") %>
-        <% elsif @printer_type == 'zebra' && Rails.configuration.x.zebra_print_enabled %>
+        <% elsif @printer_type == 'zebra' && LabelPrinter.zebra_print_enabled? %>
           <%= t("users.settings.account.label_printer.zebra_printer") %>
         <% end %>
       </h1>
@@ -25,7 +25,7 @@
 
   <% if @printer_type == 'fluics' %>
     <%= render "fluics_settings" %>
-  <% elsif @printer_type == 'zebra' && Rails.configuration.x.zebra_print_enabled %>
+  <% elsif @printer_type == 'zebra' && LabelPrinter.zebra_print_enabled? %>
      <%= render "zebra_settings" %>
   <% end %>
 </div>
diff --git a/app/views/users/settings/account/addons/index.html.erb b/app/views/users/settings/account/addons/index.html.erb
index 38d0f67e5..1d51335cb 100644
--- a/app/views/users/settings/account/addons/index.html.erb
+++ b/app/views/users/settings/account/addons/index.html.erb
@@ -20,7 +20,7 @@
     <div class="row printer-settings">
       <div class="col-xs-12 col-sm-12">
         <h2 class="addons-subtitle"><%= t('users.settings.account.addons.label_printers') %></h2>
-        <% if Rails.configuration.x.zebra_print_enabled %>
+        <% if LabelPrinter.zebra_print_enabled? %>
           <div class="printers-container">
             <div class="printer">
               <div class="header">
diff --git a/config/application.rb b/config/application.rb
index dcbbdaa1c..3502399c5 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -57,8 +57,6 @@ module Scinote
 
     config.x.webhooks_enabled = ENV['ENABLE_WEBHOOKS'] == 'true'
 
-    config.x.zebra_print_enabled = ENV['SCINOTE_ZEBRA_PRINT_ENABLED'] == 'true'
-
     # Logging
     config.log_formatter = proc do |severity, datetime, progname, msg|
       "[#{datetime}] #{severity}: #{msg}\n"
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index 3bbaf30a5..32c4831e6 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -236,7 +236,9 @@ class Constants
   }
 
   SCINOTE_FLUICS_URL = 'https://www.scinote.net/fluics/'.freeze
-  SCINOTE_ZEBRA_URL = 'https://www.zebra.com/us/en/products/software/barcode-printers/link-os/browser-print.html'.freeze
+  SCINOTE_ZEBRA_DOWNLOAD_URL = 'https://www.zebra.com/us/en/products/software/barcode-printers/link-os/browser-print.html'.freeze
+  SCINOTE_ZEBRA_BLOG_URL = 'https://www.scinote.net/blog/connect-zebra-printers/'.freeze
+  SCINOTE_ZEBRA_SUPPORT_URL = 'https://www.zebra.com/us/en/about-zebra/contact-zebra/contact-tech-support.html'.freeze
   TWO_FACTOR_RECOVERY_CODE_COUNT = 6
   TWO_FACTOR_RECOVERY_CODE_LENGTH = 12
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4beee6146..809658737 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2273,11 +2273,26 @@ en:
             p4: "3. Enter the API key into the field below."
             p5: "4. SciNote will find your printer and connect to it automatically. You can start printing labels."
           zebra_instruction:
-            p1: 'To make it work, please follow these steps:'
-            p2_html: "1. Install the Zebra BROWSER PRINT application: <a href='%{link}' target='_blank'>official downloads page.</a>"
-            p3: '2. Install the printer drivers required by your operating system.'
-            p4: '3. Allow SciNote to connect to your Zebra printers.'
-            p5: 'Make sure that Zebra Connect shows the printer status as Connected.'
+            general_html: "Make sure your Zebra printer model is supported by Zebra Browser print technology on the official Zebra page: <a href='%{link}' target='_blank'>official Browser print page.</a>"
+            contact_html: "For more detailed instructions please check the <a href='%{link_blog}' target='_blank'>SciNote blog post</a> and <a href='%{link_zebra_support}' target='_blank'>Zebra printer support.</a>"
+            usb:
+              header: 'Connect a Zebra printer via USB cable'
+              p1: 'Make sure your Zebra printer is connected to power, turned on, and connected to the computer by USB cable.'
+              p2_html: "In order to print labels from SciNote, you need to download and install the Zebra Browser Print application according to your operating system: <a href='%{link}' target='_blank'>official downloads page.</a>. During installation, you might be prompted to install a specific Zebra printer driver."
+              p3: 'Update printers with the “Update printers” option on the right side of this SciNote screen.'
+              p4: 'Your Zebra printer should now be listed in SciNote.'
+              p5: 'Go to inventories, select a label template and start printing.'
+            network:
+              header: 'Connect a Zebra printer via network (LAN or WiFi)'
+              disclaimer: 'Some Zebra printers support connection via LAN or WiFi network. Check your printer documentation or official Zebra product page for this information.'
+              p1: 'Make sure your Zebra printer is connected to power and turned on.'
+              p2: 'Make sure your computer and Zebra printer are connected to the local network (by LAN or Wi-fi).'
+              p3_html: "In order to print labels from SciNote, you need to download the Zebra Browser Print application according to your operating system: <a href='%{link}' target='_blank'>official downloads page.</a>"
+              p4: 'Install the Zebra Browser Print application.'
+              p5: 'Open the Zebra Browser Print application and set the IP address and Port number of the printer. The printer IP address should be set as “Static” (you might need to contact your IT administrator for help).'
+              p6: 'Update printers with the “Update printers” option on the right side of this SciNote screen.'
+              p7: 'Your Zebra printer should now be listed in SciNote.'
+              p8: 'Go to inventories, set the label content, and start printing.'
           settings: "Settings"
           api_key_label: "API key"
           api_key_warning: "API key change will lead to printer list refresh"
diff --git a/db/migrate/20220624091046_migrate_shared_repositories_to_user_assignments.rb b/db/migrate/20220624091046_migrate_shared_repositories_to_user_assignments.rb
index 4ed946f7d..b77649ad6 100644
--- a/db/migrate/20220624091046_migrate_shared_repositories_to_user_assignments.rb
+++ b/db/migrate/20220624091046_migrate_shared_repositories_to_user_assignments.rb
@@ -12,6 +12,8 @@ class MigrateSharedRepositoriesToUserAssignments < ActiveRecord::Migration[6.1]
     TeamRepository.where(permission_level: %i(shared_read shared_write))
                   .preload(:team, :repository)
                   .find_each do |team_repository|
+      next if team_repository.repository.blank?
+
       team_repository.team
                      .user_assignments
                      .preload(:user, :user_role)