(Merge 3.2) Empty merge, the fix was already applied to 3.3