fixed statics & statics.dev merge