Don't load options twice
Merge branch 'refs/heads/develop' into tv