I had thought I had updated my branch for !499 (merged) with these changes, as I wrote in !499 (comment 2802467), but I think my force push must have failed.
Apologies for the inconvenience.