merge r72343. Fix for issue7043
1 file changed