[z2108] Improve the RepopAtGraveyard handling of last commit. Thx to rsa for pointing

(based on commit [12156] - ccecf5b)

(based on commit [s1730] - f880c3b)