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