Merge "Remove lower case conversion of subnet"