Merge pull request #1213 from Soul1355/master

option window code cleanup
Auto generated commit for version 3.1.126.280-Test