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