Add support for prefix and suffix configuration.
Add support for mock config flag.
Merge branch 'master' into feature/update