Pulling Paul's change into staging

* Pull @Paul-Davis's change into staging