Squashed commit: adapt new logic
bravo: move manifest (1/3)
bravo: Adapt new logic (2/3)
bravo: more adjustments (3/3)