Imported changes from SPeCT
Merge branch 'function-name'