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