SLT-102 commit for midway code review