SOE-968 Decensored

SOE-968

SOE-968