Merge "Fix conditional in invalidateInternal"