gaga
Merge https://github.com/BarAshkenazi/patriot_client_side