Split "Manage roles" permission into two - edit, change & give, remove

As described in the topic, I believe the "Manage roles" permission should be splitted into two permissions:

1) Manage member roles - give / remove other members' roles, but only those which are placed under that role.

So for example:
Owner (not server creator) with Manage member roles permission - can give admin, moderator and member role, but not owner
Admin with Manage member roles permission - can give moderator and member role, but not admin or owner
Moderator WITHOUT Manage member roles permission - cannot give any roles.
Member WITHOUT Manage member roles permission - cannot give any roles

If someone has both Owner and Admin role obviously the highest one is considered (Owner).

2) Manage roles - can edit all roles under that role (just like the Manage roles currently works, but without ability to give / remove roles).

NOTE: Person with Manage roles permission should not be able to grant that permission to other roles, I think the ability to give that permission should be restricted to Administrator or person with Manage server permission.