Merge "Fix compute_unified decoration"