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