diff --git a/src/Init/Tactics.lean b/src/Init/Tactics.lean
index 9b0d5c6ae606..fe5e05253bf4 100644
--- a/src/Init/Tactics.lean
+++ b/src/Init/Tactics.lean
@@ -399,19 +399,6 @@ example (a b c d : Nat) : a + b + c + d = d + (b + c) + a := by ac_rfl
 -/
 syntax (name := acRfl) "ac_rfl" : tactic
 
-/--
-`ac_nf` normalizes equalities up to application of an associative and commutative operator.
-```
-instance : Associative (α := Nat) (.+.) := ⟨Nat.add_assoc⟩
-instance : Commutative (α := Nat) (.+.) := ⟨Nat.add_comm⟩
-
-example (a b c d : Nat) : a + b + c + d = d + (b + c) + a := by
- ac_nf
- -- goal: a + (b + (c + d)) = a + (b + (c + d))
-```
--/
-syntax (name := acNf) "ac_nf" : tactic
-
 /--
 The `sorry` tactic closes the goal using `sorryAx`. This is intended for stubbing out incomplete
 parts of a proof while still having a syntactically correct proof skeleton. Lean will give
@@ -1172,6 +1159,9 @@ Currently the preprocessor is implemented as `try simp only [bv_toNat] at *`.
 -/
 macro "bv_omega" : tactic => `(tactic| (try simp only [bv_toNat] at *) <;> omega)
 
+/-- Implementation of `ac_nf` (the full `ac_nf` calls `trivial` afterwards). -/
+syntax (name := acNf0) "ac_nf0" (location)? : tactic
+
 /-- Implementation of `norm_cast` (the full `norm_cast` calls `trivial` afterwards). -/
 syntax (name := normCast0) "norm_cast0" (location)? : tactic
 
@@ -1222,6 +1212,24 @@ See also `push_cast`, which moves casts inwards rather than lifting them outward
 macro "norm_cast" loc:(location)? : tactic =>
   `(tactic| norm_cast0 $[$loc]? <;> try trivial)
 
+/--
+`ac_nf` normalizes equalities up to application of an associative and commutative operator.
+- `ac_nf` normalizes all hypotheses and the goal target of the goal.
+- `ac_nf at l` normalizes at location(s) `l`, where `l` is either `*` or a
+  list of hypotheses in the local context. In the latter case, a turnstile `⊢` or `|-`
+  can also be used, to signify the target of the goal.
+```
+instance : Associative (α := Nat) (.+.) := ⟨Nat.add_assoc⟩
+instance : Commutative (α := Nat) (.+.) := ⟨Nat.add_comm⟩
+
+example (a b c d : Nat) : a + b + c + d = d + (b + c) + a := by
+ ac_nf
+ -- goal: a + (b + (c + d)) = a + (b + (c + d))
+```
+-/
+macro "ac_nf" loc:(location)? : tactic =>
+  `(tactic| ac_nf0 $[$loc]? <;> try trivial)
+
 /--
 `push_cast` rewrites the goal to move certain coercions (*casts*) inward, toward the leaf nodes.
 This uses `norm_cast` lemmas in the forward direction.
diff --git a/src/Lean/Elab/Tactic/BVDecide/Frontend/Attr.lean b/src/Lean/Elab/Tactic/BVDecide/Frontend/Attr.lean
index e80ab3b297e0..d5139298bedc 100644
--- a/src/Lean/Elab/Tactic/BVDecide/Frontend/Attr.lean
+++ b/src/Lean/Elab/Tactic/BVDecide/Frontend/Attr.lean
@@ -52,6 +52,11 @@ register_builtin_option debug.bv.graphviz : Bool := {
   descr := "Output the AIG of bv_decide as graphviz into a file called aig.gv in the working directory of the Lean process."
 }
 
+register_builtin_option bv.ac_nf : Bool := {
+  defValue := true
+  descr := "Canonicalize with respect to associativity and commutativitiy."
+}
+
 builtin_initialize bvNormalizeExt : Meta.SimpExtension ←
   Meta.registerSimpAttr `bv_normalize "simp theorems used by bv_normalize"
 
diff --git a/src/Lean/Elab/Tactic/BVDecide/Frontend/LRAT.lean b/src/Lean/Elab/Tactic/BVDecide/Frontend/LRAT.lean
index 4a262b9a8c9d..7756af5c6060 100644
--- a/src/Lean/Elab/Tactic/BVDecide/Frontend/LRAT.lean
+++ b/src/Lean/Elab/Tactic/BVDecide/Frontend/LRAT.lean
@@ -181,7 +181,7 @@ function together with a correctness theorem for it.
   `∀ (b : α) (c : LratCert), verifier b c = true → unsat b`
 -/
 def LratCert.toReflectionProof [ToExpr α] (cert : LratCert) (cfg : TacticContext) (reflected : α)
-    (verifier : Name) (unsat_of_verifier_eq_true : Name) : 
+    (verifier : Name) (unsat_of_verifier_eq_true : Name) :
     MetaM Expr := do
   withTraceNode `sat (fun _ => return "Compiling expr term") do
     mkAuxDecl cfg.exprDef (toExpr reflected) (toTypeExpr α)
diff --git a/src/Lean/Elab/Tactic/BVDecide/Frontend/Normalize.lean b/src/Lean/Elab/Tactic/BVDecide/Frontend/Normalize.lean
index d43f3c51d984..9884061e2a6a 100644
--- a/src/Lean/Elab/Tactic/BVDecide/Frontend/Normalize.lean
+++ b/src/Lean/Elab/Tactic/BVDecide/Frontend/Normalize.lean
@@ -5,6 +5,7 @@ Authors: Henrik Böving
 -/
 prelude
 import Lean.Meta.AppBuilder
+import Lean.Meta.Tactic.AC.Main
 import Lean.Elab.Tactic.Simp
 import Lean.Elab.Tactic.FalseOrByContra
 import Lean.Elab.Tactic.BVDecide.Frontend.Attr
@@ -112,11 +113,36 @@ def rewriteRulesPass : Pass := fun goal => do
   let some (_, newGoal) := result? | return none
   return newGoal
 
+/--
+Normalize with respect to Associativity and Commutativity.
+-/
+def acNormalizePass : Pass := fun goal => do
+  let mut newGoal := goal
+  for hyp in (← goal.getNondepPropHyps) do
+    let result ← Lean.Meta.AC.acNfHypMeta newGoal hyp
+
+    if let .some nextGoal := result then
+      newGoal := nextGoal
+    else
+      return none
+
+  return newGoal
+
 /--
 The normalization passes used by `bv_normalize` and thus `bv_decide`.
 -/
 def defaultPipeline : List Pass := [rewriteRulesPass]
 
+def passPipeline : MetaM (List Pass) := do
+  let opts ← getOptions
+
+  let mut passPipeline := defaultPipeline
+
+  if bv.ac_nf.get opts then
+    passPipeline := passPipeline ++ [acNormalizePass]
+
+  return passPipeline
+
 end Pass
 
 def bvNormalize (g : MVarId) : MetaM (Option MVarId) := do
@@ -124,7 +150,7 @@ def bvNormalize (g : MVarId) : MetaM (Option MVarId) := do
     -- Contradiction proof
     let some g ← g.falseOrByContra | return none
     trace[Meta.Tactic.bv] m!"Running preprocessing pipeline on:\n{g}"
-    Pass.fixpointPipeline Pass.defaultPipeline g
+    Pass.fixpointPipeline (← Pass.passPipeline) g
 
 @[builtin_tactic Lean.Parser.Tactic.bvNormalize]
 def evalBVNormalize : Tactic := fun
@@ -137,5 +163,3 @@ def evalBVNormalize : Tactic := fun
 
 end Frontend.Normalize
 end Lean.Elab.Tactic.BVDecide
-
-
diff --git a/src/Lean/Meta/Tactic/AC/Main.lean b/src/Lean/Meta/Tactic/AC/Main.lean
index 2ad56c105783..5b19a6f916e3 100644
--- a/src/Lean/Meta/Tactic/AC/Main.lean
+++ b/src/Lean/Meta/Tactic/AC/Main.lean
@@ -140,6 +140,25 @@ where
     | .op l r => mkApp2 preContext.op (convertTarget vars l) (convertTarget vars r)
     | .var x => vars[x]!
 
+def post (e : Expr) : SimpM Simp.Step := do
+  let ctx ← Simp.getContext
+  match e, ctx.parent? with
+  | bin op₁ l r, some (bin op₂ _ _) =>
+    if ←isDefEq op₁ op₂ then
+      return Simp.Step.done { expr := e }
+    match ←preContext op₁ with
+    | some pc =>
+      let (proof, newTgt) ← buildNormProof pc l r
+      return Simp.Step.done { expr := newTgt, proof? := proof }
+    | none => return Simp.Step.done { expr := e }
+  | bin op l r, _ =>
+    match ←preContext op with
+    | some pc =>
+      let (proof, newTgt) ← buildNormProof pc l r
+      return Simp.Step.done { expr := newTgt, proof? := proof }
+    | none => return Simp.Step.done { expr := e }
+  | e, _ => return Simp.Step.done { expr := e }
+
 def rewriteUnnormalized (mvarId : MVarId) : MetaM MVarId := do
   let simpCtx :=
     {
@@ -150,41 +169,48 @@ def rewriteUnnormalized (mvarId : MVarId) : MetaM MVarId := do
   let tgt ← instantiateMVars (← mvarId.getType)
   let (res, _) ← Simp.main tgt simpCtx (methods := { post })
   applySimpResultToTarget mvarId tgt res
-where
-  post (e : Expr) : SimpM Simp.Step := do
-    let ctx ← Simp.getContext
-    match e, ctx.parent? with
-    | bin op₁ l r, some (bin op₂ _ _) =>
-      if ←isDefEq op₁ op₂ then
-        return Simp.Step.done { expr := e }
-      match ←preContext op₁ with
-      | some pc =>
-        let (proof, newTgt) ← buildNormProof pc l r
-        return Simp.Step.done { expr := newTgt, proof? := proof }
-      | none => return Simp.Step.done { expr := e }
-    | bin op l r, _ =>
-      match ←preContext op with
-      | some pc =>
-        let (proof, newTgt) ← buildNormProof pc l r
-        return Simp.Step.done { expr := newTgt, proof? := proof }
-      | none => return Simp.Step.done { expr := e }
-    | e, _ => return Simp.Step.done { expr := e }
 
 def rewriteUnnormalizedRefl (goal : MVarId) : MetaM Unit := do
-  let newGoal ← rewriteUnnormalized goal
-  newGoal.refl
-
-def rewriteUnnormalizedNormalForm (goal : MVarId) : TacticM Unit := do
-  let newGoal ← rewriteUnnormalized goal
-  replaceMainGoal [newGoal]
+  (← rewriteUnnormalized goal).refl
 
 @[builtin_tactic acRfl] def acRflTactic : Lean.Elab.Tactic.Tactic := fun _ => do
   let goal ← getMainGoal
   goal.withContext <| rewriteUnnormalizedRefl goal
 
-@[builtin_tactic acNf] def acNfTactic : Lean.Elab.Tactic.Tactic := fun _ => do
-  let goal ← getMainGoal
-  goal.withContext <| rewriteUnnormalizedNormalForm goal
+def acNfHypMeta (goal : MVarId) (fvarId : FVarId) : MetaM (Option MVarId) := do
+  goal.withContext do
+    let simpCtx :=
+    {
+      simpTheorems  := {}
+      congrTheorems := (← getSimpCongrTheorems)
+      config        := Simp.neutralConfig
+    }
+    let tgt ← instantiateMVars (← fvarId.getType)
+    let (res, _) ← Simp.main tgt simpCtx (methods := { post })
+    return (← applySimpResultToLocalDecl goal fvarId res false).map (·.snd)
+
+/-- Implementation of the `ac_nf` tactic when operating on the main goal. -/
+def acNfTargetTactic : TacticM Unit :=
+  liftMetaTactic1 fun goal => rewriteUnnormalized goal
+
+/-- Implementation of the `ac_nf` tactic when operating on a hypothesis. -/
+def acNfHypTactic (fvarId : FVarId) : TacticM Unit :=
+  liftMetaTactic1 fun goal => acNfHypMeta goal fvarId
+
+@[builtin_tactic acNf0]
+def evalNf0 : Tactic := fun stx => do
+  match stx with
+  | `(tactic| ac_nf0 $[$loc?]?) =>
+    let loc := if let some loc := loc? then expandLocation loc else Location.targets #[] true
+    withMainContext do
+      match loc with
+      | Location.targets hyps target =>
+        if target then acNfTargetTactic
+        (← getFVarIds hyps).forM acNfHypTactic
+      | Location.wildcard =>
+        acNfTargetTactic
+        (← (← getMainGoal).getNondepPropHyps).forM acNfHypTactic
+  | _ => Lean.Elab.throwUnsupportedSyntax
 
 builtin_initialize
   registerTraceClass `Meta.AC
diff --git a/tests/lean/run/ac_rfl.lean b/tests/lean/run/ac_rfl.lean
index a3e83908a12f..62480671cc0d 100644
--- a/tests/lean/run/ac_rfl.lean
+++ b/tests/lean/run/ac_rfl.lean
@@ -43,7 +43,6 @@ example : [1, 2] ++ ([] ++ [2+4, 8] ++ [4]) = [1, 2] ++ [4+2, 8] ++ [4] := by ac
 example (a b c d : BitVec w) :
     a * b * c * d = d * c * b * a := by
   ac_nf
-  rfl
 
 example (a b c d : BitVec w) :
     a * b * c * d = d * c * b * a := by
@@ -52,7 +51,6 @@ example (a b c d : BitVec w) :
 example (a b c d : BitVec w) :
     a + b + c + d = d + c + b + a := by
   ac_nf
-  rfl
 
 example (a b c d : BitVec w) :
     a + b + c + d = d + c + b + a := by
@@ -63,7 +61,6 @@ example (a b c d : BitVec w) :
 example (a b c d : BitVec w) :
     a * (b * (c * d)) = ((a * b) * c) * d := by
   ac_nf
-  rfl
 
 example (a b c d : BitVec w) :
     a * (b * (c * d)) = ((a * b) * c) * d := by
@@ -72,7 +69,6 @@ example (a b c d : BitVec w) :
 example (a b c d : BitVec w) :
     a + (b + (c + d)) = ((a + b) + c) + d := by
   ac_nf
-  rfl
 
 example (a b c d : BitVec w) :
     a + (b + (c + d)) = ((a + b) + c) + d := by
@@ -83,7 +79,6 @@ example (a b c d : BitVec w) :
 example (a b c d : BitVec w) :
     a ^^^ b ^^^ c ^^^ d = d ^^^ c ^^^ b ^^^ a := by
   ac_nf
-  rfl
 
 example (a b c d : BitVec w) :
     a ^^^ b ^^^ c ^^^ d = d ^^^ c ^^^ b ^^^ a := by
@@ -92,7 +87,6 @@ example (a b c d : BitVec w) :
 example (a b c d : BitVec w) :
     a &&& b &&& c &&& d = d &&& c &&& b &&& a := by
   ac_nf
-  rfl
 
 example (a b c d : BitVec w) :
     a &&& b &&& c &&& d = d &&& c &&& b &&& a := by
@@ -101,7 +95,6 @@ example (a b c d : BitVec w) :
 example (a b c d : BitVec w) :
     a ||| b ||| c ||| d = d ||| c ||| b ||| a := by
   ac_nf
-  rfl
 
 example (a b c d : BitVec w) :
     a ||| b ||| c ||| d = d ||| c ||| b ||| a := by
@@ -112,7 +105,6 @@ example (a b c d : BitVec w) :
 example (a b c d : BitVec w) :
     a &&& (b &&& (c &&& d)) = ((a &&& b) &&& c) &&& d := by
   ac_nf
-  rfl
 
 example (a b c d : BitVec w) :
     a &&& (b &&& (c &&& d)) = ((a &&& b) &&& c) &&& d := by
@@ -121,7 +113,6 @@ example (a b c d : BitVec w) :
 example (a b c d : BitVec w) :
     a ||| (b ||| (c ||| d)) = ((a ||| b) ||| c) ||| d := by
   ac_nf
-  rfl
 
 example (a b c d : BitVec w) :
     a ||| (b ||| (c ||| d)) = ((a ||| b) ||| c) ||| d := by
@@ -130,7 +121,6 @@ example (a b c d : BitVec w) :
 example (a b c d : BitVec w) :
     a ^^^ (b ^^^ (c ^^^ d)) = ((a ^^^ b) ^^^ c) ^^^ d := by
   ac_nf
-  rfl
 
 example (a b c d : BitVec w) :
     a ^^^ (b ^^^ (c ^^^ d)) = ((a ^^^ b) ^^^ c) ^^^ d := by
@@ -138,4 +128,15 @@ example (a b c d : BitVec w) :
 
 example (a b c d : Nat) : a + b + c + d = d + (b + c) + a := by
   ac_nf
-  rfl
+
+example (a b c d : Nat) (h₁ h₂ : a + b + c + d = d + (b + c) + a) :
+    a + b + c + d = a + (b + c) + d := by
+
+  ac_nf at h₁
+  guard_hyp h₁ :ₛ a + (b + (c + d)) = a + (b + (c + d))
+
+  guard_hyp h₂ :ₛ a + b + c + d = d + (b + c) + a
+  ac_nf at h₂
+  guard_hyp h₂ :ₛ a + (b + (c + d)) = a + (b + (c + d))
+
+  ac_nf at *
diff --git a/tests/lean/run/bv_arith.lean b/tests/lean/run/bv_arith.lean
index 08c856b631e2..903c2a7d5947 100644
--- a/tests/lean/run/bv_arith.lean
+++ b/tests/lean/run/bv_arith.lean
@@ -2,6 +2,8 @@ import Std.Tactic.BVDecide
 
 open BitVec
 
+set_option bv.ac_nf false
+
 theorem arith_unit_1 (x y : BitVec 64) : x + y = y + x := by
   bv_decide
 
diff --git a/tests/lean/run/bv_axiom_check.lean b/tests/lean/run/bv_axiom_check.lean
index 2ef0d1732f2a..085c834e3ad1 100644
--- a/tests/lean/run/bv_axiom_check.lean
+++ b/tests/lean/run/bv_axiom_check.lean
@@ -2,6 +2,8 @@ import Std.Tactic.BVDecide
 
 open BitVec
 
+set_option bv.ac_nf false
+
 theorem bv_axiomCheck (x y : BitVec 1) : x + y = y + x := by
   bv_decide
 
diff --git a/tests/lean/run/bv_bitblast_stress.lean b/tests/lean/run/bv_bitblast_stress.lean
index c255c2f3de2a..59147dbdb69b 100644
--- a/tests/lean/run/bv_bitblast_stress.lean
+++ b/tests/lean/run/bv_bitblast_stress.lean
@@ -2,6 +2,8 @@ import Std.Tactic.BVDecide
 
 open BitVec
 
+set_option exponentiation.threshold 4096
+
 theorem t1 {x y : BitVec 64} (h : x = y) : (~~~x) &&& y = (~~~y) &&& x := by
   bv_decide
 
diff --git a/tests/lean/run/bv_bitwise.lean b/tests/lean/run/bv_bitwise.lean
index fe92517b4005..26e5f517935f 100644
--- a/tests/lean/run/bv_bitwise.lean
+++ b/tests/lean/run/bv_bitwise.lean
@@ -2,6 +2,8 @@ import Std.Tactic.BVDecide
 
 open BitVec
 
+set_option bv.ac_nf false
+
 theorem bitwise_unit_1 {x y : BitVec 64} : ~~~(x &&& y) = (~~~x ||| ~~~y) := by
   bv_decide
 
diff --git a/tests/lean/run/bv_decide_rewriter.lean b/tests/lean/run/bv_decide_rewriter.lean
index 376a699223dc..599c95bf744b 100644
--- a/tests/lean/run/bv_decide_rewriter.lean
+++ b/tests/lean/run/bv_decide_rewriter.lean
@@ -17,6 +17,12 @@ example :
 example (x y z : BitVec 8) (h1 : x = z → False) (h2 : x = y) (h3 : y = z) : False := by
   bv_decide
 
+example (x y : BitVec 256) : x * y = y * x := by
+  bv_decide
+
+example {x y z : BitVec 64} : ~~~(x &&& (y * z)) = (~~~x ||| ~~~(z * y)) := by
+  bv_decide
+
 def mem_subset (a1 a2 b1 b2 : BitVec 64) : Bool :=
   (b2 - b1 = BitVec.ofNat 64 (2^64 - 1)) ||
   ((a2 - b1 <= b2 - b1 && a1 - b1 <= a2 - b1))
@@ -39,7 +45,7 @@ example {x : BitVec 16} : x * 1 = x := by bv_normalize
 example {x : BitVec 16} : ~~~(~~~x) = x := by bv_normalize
 example {x : BitVec 16} : x &&& 0 = 0 := by bv_normalize
 example {x : BitVec 16} : 0 &&& x = 0 := by bv_normalize
-example {x : BitVec 16} : (-1#16) &&& x = x := by bv_normalize 
+example {x : BitVec 16} : (-1#16) &&& x = x := by bv_normalize
 example {x : BitVec 16} : x &&& (-1#16) = x := by bv_normalize
 example {x : BitVec 16} : x &&& x = x := by bv_normalize
 example {x : BitVec 16} : x &&& ~~~x = 0 := by bv_normalize
diff --git a/tests/lean/run/bv_errors.lean b/tests/lean/run/bv_errors.lean
index 10d136f8d0e6..caa39cb26fc6 100644
--- a/tests/lean/run/bv_errors.lean
+++ b/tests/lean/run/bv_errors.lean
@@ -2,6 +2,8 @@ import Std.Tactic.BVDecide
 
 open BitVec
 
+set_option bv.ac_nf false
+
 /--
 error: The SAT solver timed out while solving the problem.
 Consider increasing the timeout with `set_option sat.timeout <sec>`
diff --git a/tests/lean/run/bv_substructure.lean b/tests/lean/run/bv_substructure.lean
index 893dcac2ab05..44cf860a22a3 100644
--- a/tests/lean/run/bv_substructure.lean
+++ b/tests/lean/run/bv_substructure.lean
@@ -2,6 +2,8 @@ import Std.Tactic.BVDecide
 
 open BitVec
 
+set_option bv.ac_nf false
+
 theorem substructure_unit_1 (x y z : BitVec 8) : ((x = y) ∧ (y = z)) ↔ ¬(¬(x =y) ∨ (¬(y = z))) := by
   bv_decide