Merge branch 'develop'
Fix Specs around ghostmode options