[Specs Integration] Clean up implementation.
[Specs] Fix for master repo changes
Merge branch 'master' into integration_take_2

* master:
  [Specs] Fix for master repo changes