ARQGRA-170: all static contexts merged

* WARNING: the commit breaks backward compatibility