merging pull 5813 to fix sti instantiation