Feature 10923: Autohealing