Revert "Revert "RowPermissions additional code review changes""

This reverts commit 648da8863c26f6ec48ceb5c69f7f6fa031734540.