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