Merge with latest changes from EHJ-52n