Remerge Sst code (condifuration 1) with main branch
Adjustement for Sst
No change - moved history at the bootom as getting very long
No change - moved history at the bootom as getting very long
oops - previous commits included Jonathan's changes (recalled the previous commit by mistake)