MT#7545 MT#7771: migrate subs to new schema.