RF: reintroduce p23 changes