Merge "Fix for crash during ApStress on iteration."