#2095 growing a design
merging in #2095
merging in #2095
merging in #2095
merging in #2095
#2095 PATCH annotation
#2095 removed java7 stuff
 #2095 removed java7 stuff