CON-6165-Mend-heritage