Pushed last changes of S.May into the repro.