Merge "Fix invalidConfigRemoved" into tm-dev