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