Revert "Revert "Update history to reflect merge of #3154 [ci skip]""

This reverts commit af1cbc7c4446ee227046c9b574a5318ea337f574.