Issue #5695: Modify the loing compatibility