Issue #25161: Merge full stops from 3.4 into 3.5