Feature/updated oonib policy aware