add hotpatches from server
Merge branch 'potato2'