Resolve conflicts after cherry-pick from autosave branch.
Commented out one extra test printline used with Verification Grouping.