Merge "AppSearch PropertyPath does not allow non alphanumeric char" into main