Apply IDF tools patch from Cirilo Bernardo
Apply IDF tools patch from Cirilo Bernardo