Merge "Fix Tidy quietly breaking TOC disabling"