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