See attached patches. Changes from previous version:

1. drop patches 3 and 4 (not UB)
2. rename "tmp" to "dummy"
3. adjust commit messages

Thanks!