diff --git a/README.md b/README.md
index 3b3247dbdd8..14bf06e2a45 100644
--- a/README.md
+++ b/README.md
@@ -148,13 +148,17 @@ bin/rails g solidus:install --migrate=false --sample=false --seed=false
 
 You can always perform any of these steps later by using these commands.
 
+**Note: Loading sample data will automatically load seed data as well because the sample data depends on the data provided by the seeds.**
+
 ```bash
 bin/rails railties:install:migrations
 bin/rails db:migrate
-bin/rails db:seed
 bin/rails spree_sample:load
 ```
 
+If you don't want to load sample data you can use `bin/rails db:seed` instead. This command
+will populate the database with only the basic data needed for Solidus to work.
+
 There are also options and rake tasks provided by
 [solidus\_auth\_devise](https://github.com/solidusio/solidus_auth_devise).
 
diff --git a/core/app/models/spree/order_merger.rb b/core/app/models/spree/order_merger.rb
index c3414a6c5cd..291e801500e 100644
--- a/core/app/models/spree/order_merger.rb
+++ b/core/app/models/spree/order_merger.rb
@@ -67,7 +67,7 @@ def merge!(other_order, user = nil)
 
     private
 
-    # Retreive a matching line item from the existing order
+    # Retrieve a matching line item from the existing order
     #
     # It will compare line items based on variants, and all line item
     # comparison hooks on the order.
diff --git a/core/lib/generators/solidus/install/install_generator.rb b/core/lib/generators/solidus/install/install_generator.rb
index 831b53bdca6..598e099bc19 100644
--- a/core/lib/generators/solidus/install/install_generator.rb
+++ b/core/lib/generators/solidus/install/install_generator.rb
@@ -36,8 +36,8 @@ class InstallGenerator < Rails::Generators::AppBase
     ]
 
     class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus migrations'
-    class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
-    class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations and seeds must be run)'
+    class_option :seed, type: :boolean, default: true, banner: 'Run seed data task(migrations must be run)'
+    class_option :sample, type: :boolean, default: true, banner: 'Run sample data task(migrations must be run)'
     class_option :active_storage, type: :boolean, default: (
       Rails.gem_version >= Gem::Version.new("6.1.0")
     ), banner: 'Install ActiveStorage as image attachments handler for products and taxons'
@@ -63,8 +63,8 @@ def self.exit_on_failure?
 
     def prepare_options
       @run_migrations = options[:migrate]
-      @load_seed_data = options[:seed] && @run_migrations
-      @load_sample_data = options[:sample] && @run_migrations && @load_seed_data
+      @run_sample = options[:sample] && @run_migrations
+      @run_seeds = options[:seed] && @run_migrations && !@run_sample
       @selected_frontend = detect_frontend_to_install
       @selected_authentication = detect_authentication_to_install
       @selected_payment_method = detect_payment_method_to_install
@@ -172,27 +172,12 @@ def install_payment_method
       apply_template_for :payment_method, @selected_payment_method
     end
 
-    def populate_seed_data
-      if @load_seed_data
-        say_status :loading, "seed data"
-        rake_options = []
-        rake_options << "AUTO_ACCEPT=1" if options[:auto_accept]
-        rake_options << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
-        rake_options << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
+    def run_data_loaders
+      say_status_and_run_task("seed and sample data", "spree_sample:load") if @run_sample
+      say_status_and_run_task("seed data", "db:seed #{seed_data_overrides.join(' ')}") if @run_seeds
 
-        rake("db:seed #{rake_options.join(' ')}")
-      else
-        say_status :skipping, "seed data (you can always run rake db:seed)"
-      end
-    end
-
-    def load_sample_data
-      if @load_sample_data
-        say_status :loading, "sample data"
-        rake 'spree_sample:load'
-      else
-        say_status :skipping, "sample data (you can always run rake spree_sample:load)"
-      end
+      say_status :skipping, "seed data (you can always run rake db:seed)" unless @run_seeds || @run_sample
+      say_status :skipping, "sample data (you can always run rake spree_sample:load)" unless @run_sample
     end
 
     def complete
@@ -201,6 +186,19 @@ def complete
 
     private
 
+    def say_status_and_run_task(status_text, task)
+      say_status :loading, status_text
+      rake task
+    end
+
+    def seed_data_overrides
+      rake_options = []
+      rake_options << "AUTO_ACCEPT=1" if options[:auto_accept]
+      rake_options << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
+      rake_options << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
+      rake_options
+    end
+
     def generate(what, *args, abort_on_failure: true)
       args << '--auto-accept' if options[:auto_accept]
       args << '--auto-run-migrations' if options[:migrate]
diff --git a/core/spec/generators/solidus/install/install_generator_spec.rb b/core/spec/generators/solidus/install/install_generator_spec.rb
index 88f4b7ce26f..35b086f73cf 100644
--- a/core/spec/generators/solidus/install/install_generator_spec.rb
+++ b/core/spec/generators/solidus/install/install_generator_spec.rb
@@ -14,8 +14,8 @@
         expect(generator.instance_variable_get(:@selected_authentication)).to eq("devise")
         expect(generator.instance_variable_get(:@selected_payment_method)).to eq("paypal")
         expect(generator.instance_variable_get(:@run_migrations)).to eq(true)
-        expect(generator.instance_variable_get(:@load_seed_data)).to eq(true)
-        expect(generator.instance_variable_get(:@load_sample_data)).to eq(true)
+        expect(generator.instance_variable_get(:@run_seeds)).to eq(false)
+        expect(generator.instance_variable_get(:@run_sample)).to eq(true)
       end
     end
 
@@ -36,8 +36,19 @@
 
       aggregate_failures do
         expect(generator.instance_variable_get(:@run_migrations)).to eq(false)
-        expect(generator.instance_variable_get(:@load_seed_data)).to eq(false)
-        expect(generator.instance_variable_get(:@load_sample_data)).to eq(false)
+        expect(generator.instance_variable_get(:@run_seeds)).to eq(false)
+        expect(generator.instance_variable_get(:@run_sample)).to eq(false)
+      end
+    end
+
+    it 'disables "seeds" when "sample" is enabled' do
+      generator = described_class.new([], ['--auto-accept', '--sample=true'])
+      generator.prepare_options
+
+      aggregate_failures do
+        expect(generator.instance_variable_get(:@run_migrations)).to eq(true)
+        expect(generator.instance_variable_get(:@run_seeds)).to eq(false)
+        expect(generator.instance_variable_get(:@run_sample)).to eq(true)
       end
     end
 
@@ -68,17 +79,8 @@
       generator.prepare_options
 
       expect(generator.instance_variable_get(:@run_migrations)).to eq(false)
-      expect(generator.instance_variable_get(:@load_seed_data)).to eq(false)
-      expect(generator.instance_variable_get(:@load_sample_data)).to eq(false)
-    end
-
-    it 'skips sample data if seeds are disabled' do
-      generator = described_class.new([], ['--auto-accept', '--seed=false'])
-      generator.prepare_options
-
-      expect(generator.instance_variable_get(:@run_migrations)).to eq(true)
-      expect(generator.instance_variable_get(:@load_seed_data)).to eq(false)
-      expect(generator.instance_variable_get(:@load_sample_data)).to eq(false)
+      expect(generator.instance_variable_get(:@run_seeds)).to eq(false)
+      expect(generator.instance_variable_get(:@run_sample)).to eq(false)
     end
 
     context 'supports legacy frontend option names' do
@@ -130,6 +132,60 @@
     end
   end
 
+  describe "#run_data_loaders" do
+    it "executes spree_sample:load task only when sample and seed are enabled" do
+      generator = described_class.new([], ['--auto-accept', '--sample=true', '--seed=true'])
+      allow(generator).to receive(:say_status_and_run_task)
+
+      generator.prepare_options
+      generator.run_data_loaders
+
+      aggregate_failures do
+        expect(generator).to have_received(:say_status_and_run_task).with("seed and sample data", "spree_sample:load")
+        expect(generator).not_to have_received(:say_status_and_run_task).with("seed data", "db:seed")
+      end
+    end
+
+    it "does not execute spree_sample:load task when sample is disabled" do
+      generator = described_class.new([], ['--auto-accept', '--sample=false', '--seed=true'])
+      allow(generator).to receive(:say_status_and_run_task)
+      allow(generator).to receive(:say_status)
+
+      generator.prepare_options
+      generator.run_data_loaders
+
+      aggregate_failures do
+        expect(generator).to have_received(:say_status_and_run_task).with("seed data", "db:seed AUTO_ACCEPT=1")
+        expect(generator).to have_received(:say_status).with(:skipping, "sample data (you can always run rake spree_sample:load)")
+      end
+    end
+
+    it "skips both spree_sample:load and db:seed tasks when task and sample are disabled" do
+      generator = described_class.new([], ['--auto-accept', '--sample=false', '--seed=false'])
+      allow(generator).to receive(:say_status_and_run_task)
+      allow(generator).to receive(:say_status)
+
+      generator.prepare_options
+      generator.run_data_loaders
+
+      aggregate_failures do
+        expect(generator).to have_received(:say_status).with(:skipping, "seed data (you can always run rake db:seed)")
+        expect(generator).to have_received(:say_status).with(:skipping, "sample data (you can always run rake spree_sample:load)")
+      end
+    end
+
+    it "includes expected rake options for db:seed" do
+      generator = described_class.new([], ['--auto-accept', '--sample=false', '--seed=true', '--admin_email=test@solidus.io', '--admin_password=P@55word!'])
+      allow(generator).to receive(:say_status_and_run_task)
+      allow(generator).to receive(:say_status)
+
+      generator.prepare_options
+      generator.run_data_loaders
+
+      expect(generator).to have_received(:say_status_and_run_task).with("seed data", "db:seed AUTO_ACCEPT=1 ADMIN_EMAIL=test@solidus.io ADMIN_PASSWORD=P@55word!")
+    end
+  end
+
   private
 
   def strip_ansi(string)
diff --git a/sample/db/samples/shipping_methods.rb b/sample/db/samples/shipping_methods.rb
index dfff4dada84..af5e7f5c9a7 100644
--- a/sample/db/samples/shipping_methods.rb
+++ b/sample/db/samples/shipping_methods.rb
@@ -3,8 +3,11 @@
 begin
 north_america = Spree::Zone.find_by!(name: "North America")
 rescue ActiveRecord::RecordNotFound
-  puts "Couldn't find 'North America' zone. Did you run `rake db:seed` first?"
-  puts "That task will set up the countries, states and zones required for Spree."
+  puts <<~TEXT
+    Couldn't find 'North America' zone. Did you run `rails db:seed` first?
+
+    That task will set up the countries, states and zones required for your store.
+  TEXT
   exit
 end
 
diff --git a/sample/db/samples/tax_rates.rb b/sample/db/samples/tax_rates.rb
index 619e4dd3181..02b3c1b166d 100644
--- a/sample/db/samples/tax_rates.rb
+++ b/sample/db/samples/tax_rates.rb
@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 
-north_america = Spree::Zone.find_by!(name: "North America")
+begin
+  north_america = Spree::Zone.find_by!(name: "North America")
+rescue ActiveRecord::RecordNotFound
+  puts <<~TEXT
+    Couldn't find 'North America' zone. Did you run `rails db:seed` first?
+
+    That task will set up the countries, states and zones required for your store.
+  TEXT
+  exit
+end
+
 clothing = Spree::TaxCategory.find_by!(name: "Default")
 tax_rate = Spree::TaxRate.create(
   name: "North America",
diff --git a/sample/lib/spree/sample.rb b/sample/lib/spree/sample.rb
index 3b3f7d34def..b20e7a97389 100644
--- a/sample/lib/spree/sample.rb
+++ b/sample/lib/spree/sample.rb
@@ -7,7 +7,7 @@ module Spree
   module Sample
     class << self
       def load_sample(file, shell: Thor::Base.shell.new)
-        # If file is exists within application it takes precendence.
+        # If file is exists within application it takes precedence.
         if File.exist?(File.join(Rails.root, 'db', 'samples', "#{file}.rb"))
           path = File.expand_path(File.join(Rails.root, 'db', 'samples', "#{file}.rb"))
         else
diff --git a/sample/lib/tasks/sample.rake b/sample/lib/tasks/sample.rake
index 8d9794dcbce..aa6e644cd7d 100644
--- a/sample/lib/tasks/sample.rake
+++ b/sample/lib/tasks/sample.rake
@@ -5,7 +5,7 @@ require 'spree/sample'
 
 namespace :spree_sample do
   desc 'Loads sample data'
-  task load: :environment do
+  task load: ['db:seed', :environment] do
     if ARGV.include?("db:migrate")
       puts <<~TEXT
         Please run db:migrate separately from spree_sample:load.
diff --git a/sample/solidus_sample.gemspec b/sample/solidus_sample.gemspec
index dc441eca8ed..3d6b2666c8d 100644
--- a/sample/solidus_sample.gemspec
+++ b/sample/solidus_sample.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   s.author      = 'Solidus Team'
   s.email       = 'contact@solidus.io'
-  s.homepage    = 'http://solidus.io'
+  s.homepage    = 'https://solidus.io'
   s.license     = 'BSD-3-Clause'
 
   s.metadata['rubygems_mfa_required'] = 'true'
diff --git a/sample/spec/lib/load_sample_spec.rb b/sample/spec/lib/load_sample_spec.rb
index 801a9c69bed..6b412b5697f 100644
--- a/sample/spec/lib/load_sample_spec.rb
+++ b/sample/spec/lib/load_sample_spec.rb
@@ -1,12 +1,38 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
+require "rake"
 
 describe "Load samples" do
   it "doesn't raise any error" do
-    expect {
-      Spree::Core::Engine.load_seed
+    expect do
+      pid = fork { Spree::Core::Engine.load_seed }
+      Process.wait(pid)
       SpreeSample::Engine.load_samples
-    }.to output.to_stdout
+    ensure
+      Process.kill(:KILL, pid) unless $?.exitstatus.zero?
+    end.not_to raise_error
+  end
+
+  it "has db:seed as a prerequisite" do
+    Rails.application.load_tasks
+
+    task = Rake::Task["spree_sample:load"]
+    seed_task = Rake::Task["db:seed"]
+    expect(task.prerequisite_tasks).to include(seed_task)
+  end
+end
+
+describe "Load seeds multiple times" do
+  it "doesn't duplicate records" do
+    4.times do
+      pid = fork { Spree::Core::Engine.load_seed }
+      Process.wait(pid)
+    ensure
+      Process.kill(:KILL, pid) unless $?.exitstatus.zero?
+    end
+
+    expect(Spree::Store.count).to eq(1)
+    expect(Spree::Zone.count).to eq(2)
   end
 end