Backported version of 35e for 3e. Not completed, foundational only.