does this need to be merged in 2.3 as well to fix the class ?