Feature/policy parser bts732746