pl.po cherry pick - conflicts solved