reverting last commit as spice-parent is deprecated
NXCM-5237 - Release 2.5