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