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