Merge "[generic-ranging] Start porting code for generic ranging" into main