SegmentRef to hold Long ID
Merge branch 'mbst-9986-scrubbables' into stage