Corrigido import
Merge branch '7.0' of https://github.com/Trust-Code/Trust-Code into 7.0