Merge "Add IPv6 disable option"