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