Low-risk Git change plan
Turn this requested change into a low-risk Git plan. Identify the files and contracts likely affected, propose small reviewable commits, list validation after each commit, and describe a safe rollback. Do not suggest rewriting shared history unless it is explicitly allowed.