Working on core tweaks for mmp
Working on core tweaks for mmp
Fixing for issue #1508