Merge "Selectively disable filtering if estimated safe" into oc-dev