Sync with Fritz

Sorry for the monster pull request ... will use branches now.
tests relying on non existing local infrastructure are not ideal for a public oss project