Good first issuePriority: LowStatus: ParkedType: Enhancement
描述
We should add an integration test to cover similar use cases as those mentioned in #1089. We can use this branch as a starting point, after harmonizing it with the latest version of #1093 (ideally by dropping the cherry picked commit at the end, and rebasing master after it gets merged).