Merge "AllSet page fixes" into sc-dev