Merge "Cleanups only (no code changes)"