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