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