eGGiSM-1482

eGGiSM-1482