We should do the same as we did in #772 This also requires migration (on Java?) for existing data on production.