#26 merge adapted to PLF 4.1 versions line