Merge pull request #3636 from jiahuili430/normalize-config-options-main

Normalize config options main