Fix/efm 1p2c 2p 2p2c for 3.0

Merge request reports

Loading