acu161341 safety backup of new code for variables and matcher support, not working