Merge "Take care of the subnet on public subnet"