Merge "Make new fields backward compatible."