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