SOE-929 Decensored

SOE-929

SOE-929