Update after incorporating code review (CR-MI-216) comments and retest.
Some data files needed to be regenerated due to IDD changes.