[OC-3826] & [OC-4042]