Minor repairing reworks for the anvil.

Commits on 26.3.x

committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed