refs #380
refs #327
fixe #307
Merge from ymolinet #380