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