Fix #7030. Enable customization via command line