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