Merge "Avoid using deprecated PreparedEdit::$pst"