upstream-bugfix-5
