Pfm fixes: changes to extended path

MichelJuillardrequested to merge
MichelJuillard:pfm-fixes into pfm-fixes

I made a series of fixes and started to add support for expected and unexpected shocks (unfinished)

Merge request reports