#18104: null merge of 3.4 News entry