Merge "Correct reserved blocks to segments" into main