Merge "Fix NPE in TaplTestsQuickstep.tearDown" into main