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