Merge "Set ObserverInternal mitigation to zero when it's not present" into main