Fix #1572 : Add configuration customization