update 7.12.1.1 to match 7.20 plus leak-fix from hibler abt