Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into sc-dev