Merge "Adjust after "bus" device type change" into main