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