Merge "Separate backends by type"