Encode segment ID for output
Merge branch 'mbst-9986-scrubbables' into stage