Worked on platform code, deleted state machine test
Worked on platform code, deleted state machine test
Merge branch 'ric'