Merge "Adaptive scribe bounds: introduce flag 1/n" into main