fixed TCI bug
Merge branch 'release/1.24' into develop