Merge "Remove unused doRebind argument." into main