Merge branch 'rnou/338-refactor-gfind-sfind' into 'master'

Resolve "refactor gfind / sfind"

Closes #338

Closes #338

See merge request !226