Merge "Check that generate-subunit exists before using it"