[SOE-704] Part A