[FIX] conflicts incorrectly resolved when merging upstream/7.0