SS-597 add Mash to RightSupport