Issue #25161: Merge full stops from 3.5