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