master
Fix entity defaults across all protocols (#4312)
Exclude error prone annotations Recently added to gson, can be safely excluded