Merge remote-tracking branch 'origin/bko-removed-todo-for-delivery-fees-from-test' into bko-bridge-rococo-westend
