1.0.21.31: fix bad PROGV and RESTRICT-COMPILER-POLICY interaction