one more checkin @bug W-1701384@