Issue #26638: Merge option warning fixes from 3.5 into 3.6