[#81029] Recover changes made on commit 8a3740367