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