FL-692: fix application of pie patches