Merge "Fixed for bug 1168 : Issue while update subnet"