Upgrade to specs 2
Merge branch 'refs/heads/feature/upgrade_specs' into feature/general_graph