Proposal patch for v33

New changes in the code base, might not work