tagging fix
Merge branch 'master' into recursive_stable