Added extra options to validation helper
Moved mark import logic to separate library.
Merge branch 'master' into 22-import-from-other-services
Merge branch '22-import-from-other-services'