Merge with latest developments from EHJ-52n