Merge "BUG-2022: String Type pattern parsing and resolving fix."