Merge "Preserve verification invariant after compile-time verification."