Start debugging context-dependent spec failures
Merge branch 'develop'

* develop:
  Start debugging context-dependent spec failures