Porting manually cruz changes from programming/SHORT_Component_Monitoring