[trunk] fixed warning related to r2837 and move new field at the end of