Fix Optimize.ds loading issue
Merge pull request #1323 from ke-yu/fix_magn2371

Fix MAGN2371: Fix Optimize.ds loading issue