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