Common self-heal

Common self-heal

Common self-heal