That a good idea .. but this impact the way FTU are loaded. I wanted to keep the same logic here. I will create another bug to deal with that.