Merge "Adaptive scribe bounds: Connect the dots 4/n" into main