I think this is also some other fix than TS-70. This should be in own commit.