Merge pull request #1719 from stevewithington/candidate

export class extensions feature enhancements