[NUCCORE-1126] Complete TODO for nested embedded