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