Issue 2551: further reducing changes to get a compact harmonized solution