Merge pull request #1618 from nkcsgexi/bring-opt-6.0

[6.0] Options: sync-with compiler repo about recent option updates

Author: nkcsgexi