MT#6693 Align to new pbx schema.