Merge "update mainline branch reminder from T to U" into main