Respect sti_name
Merge branch 'bugfix/sti_name' into develop