Merge 'smf-gremlin' code from 'test' branch