Merge "Inlines all the fields used during upgrade and tests"