Merge "Trace input only if the layer needs an input info" into tm-dev