Merge branch 'amg-dev-backtracking-manifest' of transfer.hft-stuttgart.de:cota/cota-backend into amg-dev-backtracking-manifest