Merge "Fixing some dimentions in AllSet activity" into sc-dev