Once Jim or someone else is able to confirm uv5r isnt broken, here are the three patches attached for #1335.

Need to apply in order, a-b-c

-Jens