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