Merge with 374.501 (part 1/2)
Merge with 374.501 (part 2/2) - wireless log code merged with ours
Updated ufsd gitignore