Merge "Fix invalidation workaround" into mnc-ub-dev