diff --git a/components/jitclasses/demo/JitObjInspectorDemo b/components/jitclasses/demo/JitObjInspectorDemo
new file mode 100755
index 0000000000..ff8c387b4d
Binary files /dev/null and b/components/jitclasses/demo/JitObjInspectorDemo differ
diff --git a/components/jitclasses/demo/JitObjInspectorDemo.res b/components/jitclasses/demo/JitObjInspectorDemo.res
new file mode 100644
index 0000000000..d3a9f90178
Binary files /dev/null and b/components/jitclasses/demo/JitObjInspectorDemo.res differ
diff --git a/ide/frames/compiler_config_target.pas b/ide/frames/compiler_config_target.pas
index 27c6639272..552f81cea1 100644
--- a/ide/frames/compiler_config_target.pas
+++ b/ide/frames/compiler_config_target.pas
@@ -323,12 +323,14 @@ begin
         end;
       end;
     end;
+    //debugln(['TCompilerConfigTargetFrame.FillSubTargetComboBox UseSubTarget="',UseSubTarget,'" Candidates=[',sl.Text,']']);
     with SubtargetComboBox do begin
       Items.BeginUpdate;
       Items.Assign(sl);
       SetComboBoxText(SubtargetComboBox,UseSubTarget,cstCaseInsensitive);
       Items.EndUpdate;
     end;
+    //debugln(['TCompilerConfigTargetFrame.FillSubTargetComboBox SubtargetComboBox: Text="',SubtargetComboBox.Text,'" Index=',SubtargetComboBox.ItemIndex,' Items=[',SubtargetComboBox.Items.Text,']']);
   finally
     sl.Free;
   end;
diff --git a/ide/packages/ideconfig/compileroptions.pp b/ide/packages/ideconfig/compileroptions.pp
index 653d276d25..7e26b59d31 100644
--- a/ide/packages/ideconfig/compileroptions.pp
+++ b/ide/packages/ideconfig/compileroptions.pp
@@ -2951,6 +2951,7 @@ begin
   fTargetOS := CompOpts.fTargetOS;
   fTargetCPU := CompOpts.fTargetCPU;
   fTargetProc := CompOpts.fTargetProc;
+  FSubtarget := CompOpts.FSubtarget;
   fOptLevel := CompOpts.fOptLevel;
   fVarsInReg := CompOpts.fVarsInReg;
   fUncertainOpt := CompOpts.fUncertainOpt;