updates because of compatibility with Graphene (ARQGRA-273)