diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm
index d2264bdfe..d8f97eb83 100644
--- a/lib/Slic3r/Print.pm
+++ b/lib/Slic3r/Print.pm
@@ -740,6 +740,7 @@ sub write_gcode {
         return if $Slic3r::Config->start_gcode =~ /M(?:109|104)/i;
         for my $t (0 .. $#{$self->extruders}) {
             my $temp = $self->extruders->[$t]->first_layer_temperature;
+            $temp += $self->config->standby_temperature_delta if $self->config->standby_temperature;
             printf $fh $gcodegen->set_temperature($temp, $wait, $t) if $temp > 0;
         }
     };
diff --git a/t/multi.t b/t/multi.t
new file mode 100644
index 000000000..111481404
--- /dev/null
+++ b/t/multi.t
@@ -0,0 +1,51 @@
+use Test::More tests => 1;
+use strict;
+use warnings;
+
+BEGIN {
+    use FindBin;
+    use lib "$FindBin::Bin/../lib";
+}
+
+use List::Util qw(first);
+use Slic3r;
+use Slic3r::Test;
+
+{
+    my $config = Slic3r::Config->new_from_defaults;
+    $config->set('infill_extruder', 2);
+    $config->set('standby_temperature', 1);
+    $config->set('temperature', [200, 180]);
+    $config->set('first_layer_temperature', [206, 186]);
+    
+    my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
+    
+    my $tool = undef;
+    my @tool_temp = (0,0);
+    Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub {
+        my ($self, $cmd, $args, $info) = @_;
+        
+        if ($cmd =~ /^T(\d+)/) {
+            if (defined $tool) {
+                my $expected_temp = $self->Z == ($config->get_value('first_layer_height') + $config->z_offset)
+                    ? $config->first_layer_temperature->[$tool]
+                    : $config->temperature->[$tool];
+                die 'standby temperature was not set before toolchange'
+                    if $tool_temp[$tool] != $expected_temp + $config->standby_temperature_delta;
+            }
+            $tool = $1;
+        } elsif ($cmd eq 'M104' || $cmd eq 'M109') {
+            my $t = $args->{T} // $tool;
+            if ($tool_temp[$t] == 0) {
+                fail 'initial temperature is not equal to first layer temperature + standby delta'
+                    unless $args->{S} == $config->first_layer_temperature->[$t] + $config->standby_temperature_delta;
+            }
+            $tool_temp[$t] = $args->{S};
+        }
+        # TODO: check that toolchanges happen only outside skirt
+        # TODO: check that toolchanges retraction and restart happen outside skirt
+    });
+    ok 1, 'standby temperature';
+}
+
+__END__