changes from code review CR-MI-112