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