Merge "Add namespace to lStar" into sc-dev