Exactly the same problem fixed by PR#358 has happened again. And the same fix applies again.
Simply rebasing the commit and merging it again will fix the issue but, clearly it's not a long term solution.
Can we do something as suggested by @wez ? Is tools/update_all.py the correct location for a possible check/fix?