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