@tzcoolman I will not merge this PR yet. This change would surely break the tests...