Temporal branch with cleanup from the HPG Variant failed merge