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