zjc-enigma # PR #12522 salvage