With this commit there are problems with BT -> reverted This reverts commit 5c1dc05a365ce10385ea4d35d7df5b46d1173233.