6822370 - Is there any plan to port this fix?