rebased mdl/enable-qs to merge with main

I did a rebase of the branch mdl/enable-qs to main, it took me 2 hours and I am definitely not sure I resolved everything correctly.

Currently testing, simulations seem to work. Can you please look at it & merge into main?