Merged with v8.3 cfg sample