Added support for key-prefix options
Merge branch 'feature-keyprefixes'