Committed patch by Ting Chen to fix bug #856 (Auto-IP blocks last past the original...