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