Follow the tryond configuration refactoring

issue3627
review11381002