Merge "refactor(dice): save parent context handle" into integration