Port back Slim Pie from JB 4.3 (2/2)