Apply role_update_right to the stable branch