Merge "Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..."" into qt-dev