Merge "Separate common 'start_up' definition from v2 schema"