Updates by SENAI PR