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