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