Revert avmfritz breaker
Merge branch '3.13/misc' into 3.13/master