LPS-43037 Make consistent with other entities action