Fix issue found with EXP setting.
Fix issue found with EXP setting.
Merge remote-tracking branch 'origin/master'