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