Merge "Switch to consolidated fetch-subunit-output role"