untested AQ shield 2.0/2.1 defines