Auto merge of #160408 - fereidani:str_pattern, r=joboet