ARQGRA-170: updates because of review