Autobahn 0.5.2 backport