Update history to reflect merge of #2438 [ci skip]