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