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