Add Attachment:STR-238: Bootstrap should use autoxt of the baseline, not its own autoxt