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