Port fix for 12558 to 7.0