Merge "Remove permission correcting code" into sc-dev