Merge "Allow app downgrades" into nyc-dev