Merge "Ensure section name is not larger than max size" into main