SegmentRef Id to be stored as Long
Merge branch 'mbst-9986-scrubbables' into stage