tagging scenarios as @current
Merge branch 'master' into fs_personas