Resolved failing specs
Merge branch 'master' into staging