Merge "Ignore nonsensical clears from NoMan" into rvc-dev