ANN-6165-Mend-heritage-follow