fix compilation error with different configuration
Merge branch 'msm_restore' into magnids