I was about to apply this bugfix manually, not expecting 8.7.3 to be released quite this quickly.. :-)
The conflict merge will happen shortly after.