Merge "String tweak "upgrading" to "finishing"." into nyc-mr1-dev