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