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