ARQGRA-170: the first attempt to reduce static context