Hotfix integration upgrade