SOS-1518 Master Porting over from EE