Warnings cleanup: change private fields to non-private to avoid having to use synthetic accessors
Merge branch '2.4'