Merge with latest developments from EHJ-52n

See commit message for more details.