Up to 8.16 - Getting ready for db migrate.