[SOE-338]